Checkout
Julian Foad
committed
on 22 Jan 13
Separate the two meanings of 'ignore_ancestry' in the libsvn_client merge
APIs. The two new flags are 'ignore_mergeinfo' and 'diff_ignore_an… Show more
Separate the two meanings of 'ignore_ancestry' in the libsvn_client merge

APIs. The two new flags are 'ignore_mergeinfo' and 'diff_ignore_ancestry'.

* subversion/include/svn_client.h

 (svn_client_merge5, svn_client_merge_peg5): New, with separate flags.

 (svn_client_merge4, svn_client_merge_peg4): Deprecated.

* subversion/libsvn_client/merge.c

 (svn_client_merge5, svn_client_merge_peg5): New, with separate flags.

* subversion/libsvn_client/deprecated.c

 (svn_client_merge4, svn_client_merge_peg4): Re-implement as wrappers.

* subversion/svn/merge-cmd.c

 (merge_reintegrate, svn_cl__merge): Update callers.

Show less