[svnbook] r4509 committed - Forward fixing of ids.
svnbook at googlecode.com
svnbook at googlecode.com
Tue Jun 11 16:11:34 CDT 2013
Author: jmfelderhoff at gmx.eu
Date: Tue Jun 11 14:11:23 2013
Log: Forward fixing of ids.
--- /branches/1.6/de/book/ch07-customizing-svn.xml Mon May 13 23:26:26 2013
+++ /branches/1.6/de/book/ch07-customizing-svn.xml Tue Jun 11 14:11:23 2013
@@ -2388,7 +2388,6 @@
@@ -2412,7 +2411,63 @@
# Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
# remain in the result. Any other errorcode will be treated as fatal.
+ <example id="svn.advanced.externaldifftools.diff3.ex-2">
+ at ECHO OFF
+REM Configure your favorite three-way diff program here.
+SET DIFF3="C:\Program Files\Funky Stuff\My Diff3 Tool.exe"
+REM Subversion provides the paths we need as the last three parameters.
+REM These are parameters 9, 10, and 11. But we have access to only
+REM nine parameters at a time, so we shift our nine-parameter window
+REM twice to let us get to what we need.
+REM Call the three-way diff command (change the following line to make
+REM sense for your three-way diff program).
+%DIFF3% - -older %OLDER% - -mine %MINE% - -yours %YOURS%
+REM After performing the merge, this script needs to print the contents
+REM of the merged file to stdout. Do that in whatever way you see fit.
+REM Return an errorcode of 0 on successful merge, 1 if unresolved conflicts
+REM remain in the result. Any other errorcode will be treated as fatal.
+ <!-- ===============================================================
+ <sect2 id="svn.advanced.externaldifftools.merge">
+ <title>External merge</title>
+ <para>Subversion optionally invokes an external merge tool as
+ part of its support for interactive conflict resolution. It
+ provides as arguments to the merge tool the following: the
+ path of the unmodified base file, the path of
+ the <quote>theirs</quote> file (which contains upstream
+ changes), the path of the <quote>mine</quote> file (which
+ contains local modifications), the path of the file into which
+ the final resolved contents should be stored by the merge
+ tool, and the working copy path of the conflicted file
+ (relative to the original target of the merge operation). The
+ merge tool is expected to return an error code of 0 to
+ indicate success, or 1 to indicate failure.</para>
+ <para><xref linkend="svn.advanced.externaldifftools.merge.ex-1"/>
+ and <xref linkend="svn.advanced.externaldifftools.merge.ex-2"/> are
+ templates for external merge tool wrappers in the Python
+ and Windows batch scripting languages, respectively.</para>
+ <example id="svn.advanced.externaldifftools.merge.ex-1">
@@ -2440,8 +2495,8 @@
- <example id="svn.advanced.externaldifftools.diff3.ex-2">
+ <example id="svn.advanced.externaldifftools.merge.ex-2">
More information about the svnbook-dev