Checkout
pburba
committed
on 13 Nov 08
One small step towards mergeinfo sanity; no more explicit mergeinfo
on a WC-to-WC move/copy destination unless the source had some.

Discuss… Show more
One small step towards mergeinfo sanity; no more explicit mergeinfo

on a WC-to-WC move/copy destination unless the source had some.

Discussed here:

http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=145213.

* subversion/libsvn_client/copy.c

 (propagate_mergeinfo_within_wc): Remove.

 (do_wc_to_wc_copies, do_wc_to_wc_moves): Don't set explicit mergeinfo on

 a cp/mv destination beyond what the source had.

* subversion/tests/cmdline/copy_tests.py

* subversion/tests/cmdline/merge_tests.py

* subversion/tests/cmdline/revert_tests.py

* subversion/tests/cmdline/update_tests.py

 Update test expectations to no longer expect WC-to-WC copy/move

 destinations to always have explicit (usually empty) mergeinfo.  In a

 few cases where this mergeinfo was essential to the purpose of the test,

 the WC-to-WC cp/mv was replaced with a REPOS-to-REPOS cp/mv or empty

 mergeinfo was manually set on the destination.

 

Show less