You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2015/10/26 12:06:51 UTC

svn commit: r1710565 [1/3] - in /subversion/branches/move-tracking-2/subversion/svnmover: merge3.c svnmover.c svnmover.h

Author: julianfoad
Date: Mon Oct 26 11:06:50 2015
New Revision: 1710565

URL: http://svn.apache.org/viewvc?rev=1710565&view=rev
Log:
On the 'move-tracking-2' branch: Move the merge code to a separate source
file.

* subversion/svnmover/merge3.c
  New file, copied from 'svnmover.c'. Keep only the merge-related code.

* subversion/svnmover/svnmover.c
  Remove all merge-related code.
  (do_switch,
   execute): Track the two renames.

* subversion/svnmover/svnmover.h
  (conflict_storage_t): Move the definition to here.
  (svnmover_branch_merge,
   svnmover_display_conflicts): New declarations, with new names, for two
    functions that were previously local to 'svnmover.c'.

Added:
    subversion/branches/move-tracking-2/subversion/svnmover/merge3.c
      - copied, changed from r1710534, subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Modified:
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
    subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h