svn commit: [svnbook source]:[5044] branches/1.7/en

cmpilato at users.sourceforge.net cmpilato at users.sourceforge.net
Thu Aug 6 15:21:10 CDT 2015


Revision: 5044
          http://sourceforge.net/p/svnbook/source/5044
Author:   cmpilato
Date:     2015-08-06 20:21:10 +0000 (Thu, 06 Aug 2015)
Log Message:
-----------
Merge from /trunk/en r5043:

   [tickets:#231] Consistently use MERGE when describing custom merge tools
   
   * en/book/ch07-customizing-svn.xml
     (svn.advanced.externaldifftools.merge): Fix example merge tool
       wrapper scripts to refer to the variable MERGE (rather than
       DIFF3).
   
   Patch by: James McCoy <jamessan{__AT__}users.sf.net>

Revision Links:
--------------
    http://sourceforge.net/p/svnbook/source/5043

Modified Paths:
--------------
    branches/1.7/en/book/ch07-customizing-svn.xml

Property Changed:
----------------
    branches/1.7/en/

Index: branches/1.7/en
===================================================================
--- branches/1.7/en	2015-08-06 20:19:12 UTC (rev 5043)
+++ branches/1.7/en	2015-08-06 20:21:10 UTC (rev 5044)

Property changes on: branches/1.7/en
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en:4202,4216,4226,4231,4251,4261,4267-4270,4273,4296,4299,4305,4316,4320,4328,4352,4364,4368,4370-4372,4374-4375,4378,4380,4382,4384,4386-4387,4390,4392-4393,4463,4516,4742,4958,5041
+/trunk/en:4202,4216,4226,4231,4251,4261,4267-4270,4273,4296,4299,4305,4316,4320,4328,4352,4364,4368,4370-4372,4374-4375,4378,4380,4382,4384,4386-4387,4390,4392-4393,4463,4516,4742,4958,5041,5043
\ No newline at end of property
Modified: branches/1.7/en/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.7/en/book/ch07-customizing-svn.xml	2015-08-06 20:19:12 UTC (rev 5043)
+++ branches/1.7/en/book/ch07-customizing-svn.xml	2015-08-06 20:21:10 UTC (rev 5044)
@@ -1525,7 +1525,7 @@
 
 # Call the merge command (change the following line to make sense for
 # your merge program).
-cmd = [DIFF3, '--base', BASE, '--mine', MINE, '--theirs', THEIRS,
+cmd = [MERGE, '--base', BASE, '--mine', MINE, '--theirs', THEIRS,
               '--outfile', MERGED]
 os.execv(cmd[0], cmd)
 
@@ -1540,7 +1540,7 @@
 @ECHO OFF
 
 REM Configure your favorite merge program here.
-SET DIFF3="C:\Program Files\Funky Stuff\My Merge Tool.exe"
+SET MERGE="C:\Program Files\Funky Stuff\My Merge Tool.exe"
 
 REM Get the paths provided by Subversion.
 SET BASE=%1
@@ -1551,7 +1551,7 @@
 
 REM Call the merge command (change the following line to make sense for
 REM your merge program).
-%DIFF3% --base %BASE% --mine %MINE% --theirs %THEIRS% --outfile %MERGED%
+%MERGE% --base %BASE% --mine %MINE% --theirs %THEIRS% --outfile %MERGED%
 
 REM Return an errorcode of 0 if the conflict was resolved; 1 otherwise.
 REM Any other errorcode will be treated as fatal.




More information about the svnbook-dev mailing list