Changes between Version 6 and Version 7 of HowToBackport

Timestamp:

Apr 14, 2013, 12:07:30 AM (11 years ago)

Author:

hamish

Comment:

--

HowToBackport

@@ -21 +21 @@
 == Comparing branches ==
 
-A `diff` tool like Kompare, Kdiff3, or Meld can help. These run the standard UNIX `diff -u` utility and show the results in an easy to navigate GUI.
+A `diff` tool like Kompare, Kdiff3, or Meld can help. These run the standard UNIX "`diff -u`" utility and show the results in an easy to navigate GUI.
 
 You'll want to tell them to ignore the build files, svn paperwork files, compiled binaries, and "Last changed" timestamps on the help pages.
 This is typically done by going into the options and telling it to ignore a list of wildcard'ed path names, and regex filter for the document content.
+
+For example, to compare devbr6 and relbr64 using `kdiff3`:
+''(I used the QT version of Kdiff3)''
+{{{
+  cd grass/svn/
+  svn checkout https://svn.osgeo.org/grass/grass/branches/releasebranch_6_4 relbr64
+  svn checkout https://svn.osgeo.org/grass/grass/branches/develbranch_6 devbr6
+
+  kdiff3 relbr64/ devbr6/
+}}}
+
+ * This will take a little while to scan the two directory trees
+ * Once loaded, go to `Settings` → `Configure KDiff3...`
+ * Go into the Directory tab
+   * To "File-anti-pattern(s):" add "`;*.tmp.html`"
+   * To "Dir-anti-pattern(s):" add "`;OBJ.x86*;dist.x86*;bin.x86*`"
+     * ''(if not working with translations today you might add "`;locale`" to that too)''
+   * In "File Comparison Mode" select "`Full analysis`"
+ * Go to the Diff tab
+   * In the "Line-matching preprocessor command:" line add "`grep -v "Last changed: $Date: 2"`"
+     * ''(this will ignore the $Date:$ svn keywords at the end of the help pages)''
+This is typically done by going into the options and telling it to ignore a list of wildcard'ed path names, and regex filter for the document content.