[Python-apps-commits] r2187 - in packages/mercurial/branches/1.1-vt/debian (3 files)

[vt-guest at users.alioth.debian.org]

    Date: Friday, January 9, 2009 @ 19:15:13
  Author: vt-guest
Revision: 2187

Add deb_specific__mergetools patch

Added:
  packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__mergetools
Modified:
  packages/mercurial/branches/1.1-vt/debian/changelog
  packages/mercurial/branches/1.1-vt/debian/patches/series

Modified: packages/mercurial/branches/1.1-vt/debian/changelog
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/changelog	2009-01-09 19:11:15 UTC (rev 2186)
+++ packages/mercurial/branches/1.1-vt/debian/changelog	2009-01-09 19:15:13 UTC (rev 2187)
@@ -30,6 +30,7 @@
         (patch template search path to /usr/share instead of symlinking from
         the module directory)
       - backport__zeroconf-doc, proposed_upstream__correct-zeroconf-doc
+      - deb_specific__mergetools
     - Renamed deb_specific__ElementTree_for_darcs.patch to
       deb_specific__optional-dependencies and updated to suggest Debian
       packages for more optional dependencies
@@ -53,7 +54,7 @@
     + Add ${misc:Depends} to Depends to remove
       lintian warning.
 
- -- Vernon Tang <vt at foilhead.net>  Thu, 08 Jan 2009 10:54:03 +0800
+ -- Vernon Tang <vt at foilhead.net>  Sat, 10 Jan 2009 02:19:44 +0800
 
 mercurial (1.0.1-5.1) unstable; urgency=high
 

Added: packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__mergetools
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__mergetools	                        (rev 0)
+++ packages/mercurial/branches/1.1-vt/debian/patches/deb_specific__mergetools	2009-01-09 19:15:13 UTC (rev 2187)
@@ -0,0 +1,34 @@
+Add non-graphical vimdiff to and remove tools irrelevant to a Debian system
+(especially filemerge, see Issue1459) from mergetools.hgrc
+
+diff -r 11a4eb81fb4f contrib/mergetools.hgrc
+--- a/contrib/mergetools.hgrc
++++ b/contrib/mergetools.hgrc
+@@ -12,8 +12,11 @@
+ gvimdiff.regname=path
+ gvimdiff.priority=-9
+ 
++vimdiff.args=$local $other $base
++vimdiff.priority=-10
++
+ merge.checkconflicts=True
+-merge.priority=-10
++merge.priority=-11
+ 
+ gpyfm.gui=True
+ 
+@@ -38,14 +41,6 @@
+ p4merge.gui=True
+ p4merge.priority=-8
+ 
+-tortoisemerge.args=/base: $output /mine:$local /theirs:$other /merged:$output
+-tortoisemerge.regkey=Software\TortoiseSVN
+-tortoisemerge.gui=True
+-
+ ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
+ ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
+ ecmerge.gui=True
+-
+-filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
+-filemerge.args=-left $other -right $local -ancestor $base -merge $output
+-filemerge.gui=True

Modified: packages/mercurial/branches/1.1-vt/debian/patches/series
===================================================================
--- packages/mercurial/branches/1.1-vt/debian/patches/series	2009-01-09 19:11:15 UTC (rev 2186)
+++ packages/mercurial/branches/1.1-vt/debian/patches/series	2009-01-09 19:15:13 UTC (rev 2187)
@@ -1,3 +1,4 @@
+deb_specific__mergetools
 deb_specific__install-templates-separately
 proposed_upstream__python-module-not-script.patch
 deb_specific__use_sensible-editor.patch