#136 examples for external merge use the wrong argument order for mine and theirs arguments

[Anonymous]

Originally created by: tstev...@gmail.com
Originally owned by: cmpilato

Please describe the problem you found.  Try to avoid referring to "page
numbers", as those are subject to change over time.  If you need to, quote
the book paragraph(s) that are incorrect, and recommend corrections.

The examples 7.6 "mergewrap.py" and 7.7 "mergewrap.bat" use the wrong argument order for the "paths provided by Subversion."  The MINE and THEIRS arguments are reversed.  The routine svn_cl__merge_file_externally in svn/util.c from 1.6.17 and the current version [r1140729] use a different order:

        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] = NUL

[Anonymous]

Originally posted by: cmpilato

Doh!  Thanks for catching and reporting this!

Labels: Milestone-en-1.6
Owner: cmpilato

[Anonymous]

Originally posted by: cmpilato

Fixed in [r3916].

Status: Fixed