Branch: refs/heads/incoming
Home: https://github.com/jenkinsci/svnkit
Commit: 0fb30b03751270d6e2d67aa6c421aba2be3b34aa
https://github.com/jenkinsci/svnkit/commit/0fb30b03751270d6e2d67aa6c421aba2be3b34aa
Author: Dmitry Pavlenko <[email protected]>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/SVNUpdateEditor17.java
M
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/SVNWCContext.java
A
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/SvnConflictReport.java
A
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/SvnSingleRangeConflictReport.java
M svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/ISVNWCDb.java
M svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SVNWCDb.java
M
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnExternalUpdateEditor.java
M
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbConflicts.java
A
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/ISvnDiffCallback2.java
A
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnDiffSource.java
M svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgAdd.java
M
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgMerge.java
M
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgMergeCallback.java
A
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgMergeCallback2.java
M
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgMergeDriver.java
M
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgMergePegged.java
A
svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgRemoteMergeEditor.java
M svnkit/src/main/java/org/tmatesoft/svn/core/wc/SVNConflictReason.java
Log Message:
-----------
Basic implementation of merge command.
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
