John Gardiner Myers <jgmyers@proofpoint.com>


Patch
r876200, r876191, r875154

r876200 | stsp | 2009-02-25 07:44:36 -0600 (Wed, 25 Feb 2009)

[Note from the future: This revision was reverted in r36147]

Make it possible for external merge tools to abort the merge
by exiting with an exit code other than 0 or 1.

* subversion/svn/util.c
  (svn_cl__merge_file_externally): Retrieve exit code from svn_io_run_cmd,
   and return an error if it is not 0 and not 1.

* subversion/include/svn_io.h
  (svn_io_wait_for_cmd): Better document under what conditions callers
   can expect to retrieve the exit code of the child process.

Patch by: John Gardiner Myers <jgmyers@proofpoint.com>
Tweaked by: me
            julianfoad
            sbutler


r876191 | stsp | 2009-02-25 06:03:41 -0600 (Wed, 25 Feb 2009)

[Note from the future: This revision was reverted in r36147]

Pass name of conflicted file to merge tool.

* subversion/svn/cl.h
  (svn_cl__merge_file_externally): Add new wc_name parameter.

* subversion/svn/util.c
  (svn_cl__merge_file_externally): Pass new wc_name parameter
   to the merge tool.

* subversion/svn/conflict-callbacks.c
  (launch_resolver, svn_cl__conflict_handler): Pass new parameter
   to svn_cl__merge_file_externally().

Patch by: John Gardiner Myers <jgmyers@proofpoint.com>


r875154 | julianfoad | 2009-01-08 09:45:19 -0600 (Thu, 08 Jan 2009)

Add a contributed hook script.

Patch by: John Gardiner Myers <jgmyers{_AT_}proofpoint.com>

* contrib/hook-scripts/require-mergeinfo.pl
  New hook script.

* www/tools_contrib.html
  (hook_scripts): Document it.