diff options
Diffstat (limited to 'src/svnqt/client_merge.cpp')
| -rw-r--r-- | src/svnqt/client_merge.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/svnqt/client_merge.cpp b/src/svnqt/client_merge.cpp index 0d84cc2..feb846c 100644 --- a/src/svnqt/client_merge.cpp +++ b/src/svnqt/client_merge.cpp @@ -1,15 +1,15 @@ -#include "svnqt/client_impl.hpp" +#include "svnqt/client_impl.h" // subversion api #include "svn_client.h" -#include "svnqt/exception.hpp" -#include "svnqt/pool.hpp" -#include "svnqt/targets.hpp" -#include "svnqt/svnqt_defines.hpp" -#include "svnqt/stringarray.hpp" +#include "svnqt/exception.h" +#include "svnqt/pool.h" +#include "svnqt/targets.h" +#include "svnqt/svnqt_defines.h" +#include "svnqt/stringarray.h" -#include "svnqt/helper.hpp" +#include "svnqt/helper.h" namespace svn { @@ -22,7 +22,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, bool dry_run, bool record_only, const StringArray&merge_options - ) throw (ClientException) + ) { Pool pool; svn_error_t * error = 0; @@ -87,7 +87,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, bool force, bool record_only, const StringArray&merge_options - ) throw (ClientException) + ) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) Pool pool; @@ -129,7 +129,7 @@ void Client_impl::merge (const Path & path1, const Revision & revision1, bool dry_run, bool force, const StringArray&merge_options - ) throw (ClientException) + ) { #if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1) RevisionRanges ranges; |