Checkout
Julian Foad
committed
on 16 Nov 15
Merge the 'svnmover' prototype from the 'move-tracking-2' branch to trunk.

See the dev@ email thread "Merge 'svnmover' demo tool to trunk" … Show more
Merge the 'svnmover' prototype from the 'move-tracking-2' branch to trunk.

See the dev@ email thread "Merge 'svnmover' demo tool to trunk" started on

2015-11-10, archived at e.g. <http://mail-archives.apache.org/mod_mbox/subversion-dev/201511.mbox/%3CCAEcU=1YE5Ci02j_4aAeB_roS1X0H2QWPP3juu0exjVJ-FGCLyg@mail.gmail.com%3E>.

This is a reintegration (performed as an automatic merge) followed by

reverting the unwanted parts. As such, those unwanted parts (such as shim

insertions in several libraries) will be treated as 'record-only merged' and

will not be picked up by any subsequent automatic merge to trunk.

A brief description of the changes follows.

* build.conf

 Adjust to build the new files.

* configure.ac

 Adjust compiler warning flags to not warn about passing or returning a

 structure, because some of the code does so.

* LICENSE

 Add the licence text for the embedded 'linenoise' library.

* notes/move-tracking/README

 New file, describing this work.

* subversion/include/private/svn_branch.h,

 subversion/include/private/svn_branch_compat.h,

 subversion/include/private/svn_branch_impl.h,

 subversion/include/private/svn_branch_nested.h,

 subversion/include/private/svn_branch_repos.h,

 subversion/include/private/svn_element.h

 New files.

* subversion/libsvn_delta/branch.c,

 subversion/libsvn_delta/branch_compat.c,

 subversion/libsvn_delta/branch_migrate.c,

 subversion/libsvn_delta/branch_nested.c,

 subversion/libsvn_delta/branch_repos.c,

 subversion/libsvn_delta/element.c

 New files.

* subversion/include/private/svn_cmdline_private.h

 subversion/libsvn_subr/cmdline.c

 (svn_cmdline__stdin_is_a_terminal,

  svn_cmdline__stdout_is_a_terminal,

  svn_cmdline__stderr_is_a_terminal): New.

* subversion/tests/cmdline/svnmover_tests.py

 New file.

* subversion/tests/cmdline/svntest/actions.py

 (run_and_verify_svnmover,

  run_and_verify_svnmover2): New.

* subversion/tests/cmdline/svntest/main.py

 (svnmover_binary,

  run_svnmover): New.

 (execute_tests): Initialize 'svnmover_binary'.

* subversion/tests/cmdline/svntest/wc.py

 (State): Add 'rename' and 'from_eids' methods.

 (StateItem): Add an 'eid' attribute.

* tools/dev/svnmover

 New tool.

Show less