Menu

Commit [r317]  Maximize  Restore  History

Make the former '--ignore-ancestry' behavior for diffs and merges the

default, reversing the sense and changing the name of the option to
'--notice-ancestry'.

* subversion/clients/cmdline/cl.h
(svn_cl__notice_ancestry_opt): Was svn_cl__ignore_ancestry_opt.
(svn_cl__opt_state_t): Rename 'ignore_ancestry' to 'notice_ancestry'.

* subversion/clients/cmdline/main.c
(svn_cl__options, svn_cl__cmd_table, main): Track renamed option.

* subversion/clients/cmdline/diff-cmd.c
(svn_cl__diff): Track renamed option (and its sense reversal).

* subversion/clients/cmdline/merge-cmd.c
(svn_cl__merge): Track renamed option (and its sense reversal).

* subversion/tests/clients/cmdline/merge_tests.py
(merge_with_implicit_target): Shorten description.
(test_list): merge_similar_unrelated_trees() is no longer expected
to fail.

* subversion/doc/book/book/ch06.xml
* subversion/doc/book/book/ch08.xml
Track the renamed option.

cmpilato 2003-07-29

changed /trunk/src/book/book/ch06.xml
changed /trunk/src/book/book/ch08.xml
/trunk/src/book/book/ch06.xml Diff Switch to side-by-side view
Loading...
/trunk/src/book/book/ch08.xml Diff Switch to side-by-side view
Loading...
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.