Re: external merge tool argument order does not match sample in svn-book
On Wed, Jul 20, 2011 at 02:41:02PM -0600, Steven Trabert wrote:
> Example 7.6 "mergewrap.py" shows the argument order as
> ># Get the paths provided by Subversion.
> >BASE = sys.argv
> >MINE = sys.argv
> >THEIRS = sys.argv
> >MERGED = sys.argv
> >WCPATH = sys.argv
> 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 = merge_tool;
> > arguments = base_path;
> > arguments = their_path;
> > arguments = my_path;
> > arguments = merged_path;
> > arguments = wc_path;
> > arguments = 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?
Received on 2011-07-21 10:56:32 CEST
This is an archived mail posted to the Subversion Users