On Wed, Jul 20, 2011 at 02:41:02PM -0600, Steven Trabert wrote: > http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.advanced.externaldifftools.merge, > Example 7.6 "mergewrap.py" shows the argument order as > ># Get the paths provided by Subversion. > >BASE = sys.argv[1] > >MINE = sys.argv[2] > >THEIRS = sys.argv[3] > >MERGED = sys.argv[4] > >WCPATH = sys.argv[5] > Example 7.7. mergewrap.bat shows the same order as Example 7.6. > > However, the routine svn_cl__merge_file_externally in svn/util.c, > 1.6.17, uses a different order ( the mine and their arguments are > switched ): > > > arguments[0] = merge_tool; > > arguments[1] = base_path; > > arguments[2] = their_path; > > arguments[3] = my_path; > > arguments[4] = merged_path; > > arguments[5] = wc_path; > > arguments[6] = NULL; > > the current version, r1140729, shows the same order in util.c as 1.6.17. > > ** <http://svn.apache.org/viewvc?view=revision&revision=1140729>
Can you file a ticket in the book's issue tracker, please? http://code.google.com/p/svnbook/issues/list Thank you!
