subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Julian Foad <julianf...@apache.org>
Subject Re: Merge 'svnmover' demo tool to trunk
Date Mon, 16 Nov 2015 17:51:10 GMT
OK, this is now merged as r1714640:

$ svn up
Updating '.':
At revision 1714632.

$ svn merge -v ^/subversion/branches/move-tracking-2
--- Merging
--- Merging differences between repository URLs into '.':
A    BRANCH-README
A    notes/move-tracking
A    notes/move-tracking/element-model
A    notes/move-tracking/element-model/NestedBranches.svg
A    notes/move-tracking/element-model/moves-element-model.lyx
A    notes/move-tracking/element-model/TopLevelBranches.svg
A    notes/move-tracking/element-model/moves-element-model.html
A    notes/move-tracking/README
U    subversion/libsvn_subr/cmdline.c
U    subversion/tests/cmdline/svntest/wc.py
U    subversion/tests/cmdline/svntest/actions.py
A    subversion/tests/cmdline/svnmover_tests.py
A    subversion/include/private/svn_branch_impl.h
A    subversion/include/private/svn_branch_compat.h
A    subversion/include/private/svn_branch_repos.h
U    subversion/include/private/svn_cmdline_private.h
A    subversion/include/private/svn_editor3e.h
A    subversion/include/private/svn_element.h
A    subversion/include/private/svn_branch.h
A    subversion/include/private/svn_branch_nested.h
U    subversion/libsvn_wc/util.c
U    subversion/libsvn_ra_serf/serf.c
A    subversion/libsvn_delta/branch_migrate.c
A    subversion/libsvn_delta/branch_repos.c
A    subversion/libsvn_delta/element.c
A    subversion/libsvn_delta/branch.c
A    subversion/libsvn_delta/branch_nested.c
A    subversion/libsvn_delta/branch_compat.c
 U   subversion/libsvn_fs_x
A    tools/dev/svnmover
A    tools/dev/svnmover/svnmover.c
A    tools/dev/svnmover/merge3.c
A    tools/dev/svnmover/ra.c
A    tools/dev/svnmover/linenoise
A    tools/dev/svnmover/linenoise/LICENSE
A    tools/dev/svnmover/linenoise/linenoise.c
A    tools/dev/svnmover/linenoise/linenoise.h
A    tools/dev/svnmover/linenoise/README.markdown
A    tools/dev/svnmover/svnmover.h
A    tools/dev/svnmover/scanlog.c
A    tools/dev/svnmover/util.c
U    configure.ac
U    subversion/libsvn_ra/ra_loader.c
U    subversion/libsvn_ra/ra_loader.h
U    subversion/libsvn_ra_local/ra_plugin.c
U    subversion/tests/cmdline/svntest/main.py
U    subversion/libsvn_ra_svn/client.c
U    subversion/include/private/svn_ra_private.h
U    subversion/include/private/svn_wc_private.h
U    subversion/libsvn_wc/deprecated.c
U    subversion/libsvn_wc/wc.h
U    subversion/libsvn_wc/update_editor.c
U    subversion/libsvn_client/update.c
U    subversion/libsvn_client/switch.c
U    subversion/libsvn_repos/commit.c
U    LICENSE
U    build.conf
 U   .
--- Recording mergeinfo for merge between repository URLs into '.':
 G   .
 U   notes/move-tracking/README
 U   subversion/libsvn_fs_x

$ svn revert -R BRANCH-README
subversion/include/private/svn_editor3e.h subversion/libsvn_wc/
subversion/libsvn_ra*/ subversion/include/private/svn_ra_private.h
subversion/include/private/svn_wc_private.h subversion/libsvn_wc/
subversion/libsvn_client/ subversion/libsvn_repos/
Reverted 'BRANCH-README'
Reverted 'subversion/include/private/svn_editor3e.h'
Reverted 'subversion/libsvn_wc/util.c'
Reverted 'subversion/libsvn_wc/wc.h'
Reverted 'subversion/libsvn_wc/update_editor.c'
Reverted 'subversion/libsvn_wc/deprecated.c'
Reverted 'subversion/libsvn_ra/ra_loader.h'
Reverted 'subversion/libsvn_ra/ra_loader.c'
Reverted 'subversion/libsvn_ra_local/ra_plugin.c'
Reverted 'subversion/libsvn_ra_serf/serf.c'
Reverted 'subversion/libsvn_ra_svn/client.c'
Reverted 'subversion/include/private/svn_ra_private.h'
Reverted 'subversion/include/private/svn_wc_private.h'
Reverted 'subversion/libsvn_client/update.c'
Reverted 'subversion/libsvn_client/switch.c'
Reverted 'subversion/libsvn_repos/commit.c'

$ svn ci -F ff
Sending        .
Sending        LICENSE
Sending        build.conf
Sending        configure.ac
Adding         notes/move-tracking
Sending        notes/move-tracking/README
Adding         subversion/include/private/svn_branch.h
Adding         subversion/include/private/svn_branch_compat.h
Adding         subversion/include/private/svn_branch_impl.h
Adding         subversion/include/private/svn_branch_nested.h
Adding         subversion/include/private/svn_branch_repos.h
Sending        subversion/include/private/svn_cmdline_private.h
Adding         subversion/include/private/svn_element.h
Adding         subversion/libsvn_delta/branch.c
Adding         subversion/libsvn_delta/branch_compat.c
Adding         subversion/libsvn_delta/branch_migrate.c
Adding         subversion/libsvn_delta/branch_nested.c
Adding         subversion/libsvn_delta/branch_repos.c
Adding         subversion/libsvn_delta/element.c
Sending        subversion/libsvn_fs_x
Sending        subversion/libsvn_subr/cmdline.c
Adding         subversion/tests/cmdline/svnmover_tests.py
Sending        subversion/tests/cmdline/svntest/actions.py
Sending        subversion/tests/cmdline/svntest/main.py
Sending        subversion/tests/cmdline/svntest/wc.py
Adding         tools/dev/svnmover
Transmitting file data ........done
Committing transaction...
Committed revision 1714640.

Let me know if there's anything you don't like, and I'll be glad to
see what we can best do about it.

I look forward to working with you all on trunk.

- Julian

Mime
View raw message