[Python-apps-commits] r1334 - in packages/mercurial/trunk/debian (4 files)

[vdanjean at users.alioth.debian.org]

    Date: Tuesday, May 20, 2008 @ 21:06:34
  Author: vdanjean
Revision: 1334

Document new upstream merge strategy

Modified:
  packages/mercurial/trunk/debian/NEWS
  packages/mercurial/trunk/debian/changelog
  packages/mercurial/trunk/debian/mercurial-common.examples
  packages/mercurial/trunk/debian/rules

Modified: packages/mercurial/trunk/debian/NEWS
===================================================================
--- packages/mercurial/trunk/debian/NEWS	2008-05-20 20:20:33 UTC (rev 1333)
+++ packages/mercurial/trunk/debian/NEWS	2008-05-20 21:06:34 UTC (rev 1334)
@@ -1,3 +1,15 @@
+mercurial (1.0-5) unstable; urgency=low
+
+  Since the 1.0 version, mercurial handles most of the merges internaly.
+  This is an upstream decision (see upstream changeset f077815932ce)
+  that the debian package will follow. This means that :
+  - there is no hgmerge script any more
+  - programs that were invoked by hgmerge (kdiff3, ...) are not by default
+  See http://www.selenic.com/mercurial/wiki/index.cgi/MergeToolConfiguration
+  for configuring mergetools with mercurial 1.0
+
+ -- Vincent Danjean <vdanjean at debian.org>  Tue, 20 May 2008 22:37:24 +0200
+
 mercurial (1.0) unstable; urgency=low
 
   Since the 1.0 version, the hbisect extension is now provided as a 
@@ -7,7 +19,6 @@
   hgext.hbisect: No module  named  hbisect". Just delete the  
   hgext.hbisect entry in the hgext.rc and/or .hgrc file.
   
-
  -- Gerardo Curiel <gcuriel at debian.org.ve>  Wed, 02 Apr 2008 16:14:47 -0430
 
 mercurial (0.9) unstable; urgency=low

Modified: packages/mercurial/trunk/debian/changelog
===================================================================
--- packages/mercurial/trunk/debian/changelog	2008-05-20 20:20:33 UTC (rev 1333)
+++ packages/mercurial/trunk/debian/changelog	2008-05-20 21:06:34 UTC (rev 1334)
@@ -1,3 +1,12 @@
+mercurial (1.0-5) unstable; urgency=low
+
+  * Add a note in the NEWS file about upstream change for merging conflicts.
+    (Closes: #481553, )
+  * install mergetools.hgrc system wide (Closes: #481089)
+
+
+ -- Vincent Danjean <vdanjean at debian.org>  Tue, 20 May 2008 22:46:57 +0200
+
 mercurial (1.0-4) unstable; urgency=low
 
   * fix build system so that "hg version" works

Modified: packages/mercurial/trunk/debian/mercurial-common.examples
===================================================================
--- packages/mercurial/trunk/debian/mercurial-common.examples	2008-05-20 20:20:33 UTC (rev 1333)
+++ packages/mercurial/trunk/debian/mercurial-common.examples	2008-05-20 21:06:34 UTC (rev 1334)
@@ -5,7 +5,6 @@
 contrib/hgsh
 contrib/hg-ssh
 contrib/rewrite-log
-contrib/mergetools.hgrc
 contrib/sample.hgrc
 contrib/simplemerge
 contrib/tcsh_completion

Modified: packages/mercurial/trunk/debian/rules
===================================================================
--- packages/mercurial/trunk/debian/rules	2008-05-20 20:20:33 UTC (rev 1333)
+++ packages/mercurial/trunk/debian/rules	2008-05-20 21:06:34 UTC (rev 1334)
@@ -32,6 +32,9 @@
 		>  $(CURDIR)/debian/mercurial/etc/mercurial/hgrc
 	echo "# See hgrc(5) for more information" \
 		>>  $(CURDIR)/debian/mercurial/etc/mercurial/hgrc
+	install -m 644 \
+		contrib/mergetools.hgrc \
+		$(CURDIR)/debian/mercurial/etc/mercurial/hgrc.d/mergetools.rc
 
 build/mercurial:: mercurial/__version__.py