[svnkit] 01/03: Merge branch 'upstream+dfsg'

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository svnkit.

commit 890763506487d74acda99e27913ccfecc4ec903d
Merge: b259d29 05cc2c4
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Apr 5 12:13:40 2014 -0300

    Merge branch 'upstream+dfsg'

 CHANGES.txt                                        |   9 +
 build.gradle                                       |   2 +-
 .../java/org/tmatesoft/svn/core/SVNProperty.java   |   2 +-
 .../internal/io/svn/sasl/SVNSaslAuthenticator.java |   6 +
 .../internal/wc17/SVNRemoteStatusEditor17.java     |   6 +
 .../svn/core/internal/wc17/SVNStatusEditor17.java  |   9 +-
 .../svn/core/internal/wc17/SVNWCContext.java       |  13 +-
 .../svn/core/internal/wc17/db/SVNWCDb.java         |   4 +-
 .../core/internal/wc17/db/SvnWcDbConflicts.java    |  83 +++++++++
 .../svn/core/internal/wc17/db/SvnWcDbCopy.java     |   2 +-
 .../svn/core/internal/wc17/db/SvnWcDbRevert.java   |   5 +-
 .../SVNWCDbInsertWorkingNodeCopyFrom.java          | 153 +++++++++++++++++
 .../wc17/db/statement/SVNWCDbStatements.java       |   1 +
 .../statement17/SvnRevertActualNodesTrigger17.java | 108 ++++++++++++
 .../core/internal/wc2/ng/SvnNgMergeCallback2.java  |   2 +-
 .../svn/core/internal/wc2/ng/SvnNgWcToWcCopy.java  |  16 +-
 .../tmatesoft/svn/core/io/repository/template.jar  | Bin 0 -> 16301 bytes
 .../org/tmatesoft/svn/core/wc/SVNBasicClient.java  |  18 +-
 .../tmatesoft/svn/core/wc/SVNChangelistClient.java |   5 +
 .../tmatesoft/svn/core/wc/SVNClientManager.java    | 188 ++++++++++++---------
 .../org/tmatesoft/svn/core/wc/SVNCommitClient.java |  15 +-
 .../org/tmatesoft/svn/core/wc/SVNCopyClient.java   |  11 +-
 .../org/tmatesoft/svn/core/wc/SVNDiffClient.java   |  18 +-
 .../org/tmatesoft/svn/core/wc/SVNLogClient.java    |  15 +-
 .../org/tmatesoft/svn/core/wc/SVNMoveClient.java   |   7 +-
 .../org/tmatesoft/svn/core/wc/SVNStatusClient.java |  13 +-
 .../org/tmatesoft/svn/core/wc/SVNUpdateClient.java |  16 +-
 .../org/tmatesoft/svn/core/wc/SVNWCClient.java     |  31 +---
 .../svn/core/wc/admin/SVNAdminBasicClient.java     |   9 +-
 .../svn/core/wc/admin/SVNAdminClient.java          |   5 +
 .../tmatesoft/svn/core/wc/admin/SVNLookClient.java |   5 +
 .../main/java/org/tmatesoft/svn/util/Version.java  |   6 +-
 .../tmatesoft/svn/core/io/repository/template.jar  | Bin 0 -> 16301 bytes
 .../test/java/org/tmatesoft/svn/test/CopyTest.java |  77 +++++++++
 .../test/java/org/tmatesoft/svn/test/MoveTest.java | 118 ++++++++++++-
 .../java/org/tmatesoft/svn/test/RevertTest.java    |  57 +++++++
 .../java/org/tmatesoft/svn/test/StatusTest.java    | 122 ++++++++++++-
 37 files changed, 972 insertions(+), 185 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/svnkit.git