[Python-apps-commits] r9441 - in packages/mercurial/branches/squeeze-backports/debian (3 files)

[vicho at users.alioth.debian.org]

    Date: Sunday, February 17, 2013 @ 11:21:41
  Author: vicho
Revision: 9441

Merge revs 9377:9378 from wheezy into squeeze-backports

Added:
  packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch
    (from rev 9378, packages/mercurial/branches/wheezy/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch)
Modified:
  packages/mercurial/branches/squeeze-backports/debian/changelog
  packages/mercurial/branches/squeeze-backports/debian/patches/series

Modified: packages/mercurial/branches/squeeze-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/changelog	2013-02-14 19:16:34 UTC (rev 9440)
+++ packages/mercurial/branches/squeeze-backports/debian/changelog	2013-02-17 11:21:41 UTC (rev 9441)
@@ -1,3 +1,10 @@
+mercurial (2.2.2-2) unstable; urgency=low
+
+  * Fix "Please add patch from http://bz.selenic.com/show_bug.cgi?id=3511"
+    by adding it (Closes: #698634)
+
+ -- Javi Merino <vicho at debian.org>  Mon, 21 Jan 2013 23:33:20 +0000
+
 mercurial (2.2.2-1~bpo60+1) squeeze-backports; urgency=low
 
   * Rebuild for squeeze-backports.

Copied: packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch (from rev 9378, packages/mercurial/branches/wheezy/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch)
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch	                        (rev 0)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch	2013-02-17 11:21:41 UTC (rev 9441)
@@ -0,0 +1,30 @@
+Origin: http://selenic.com/hg/rev/8b7cd9a998f0
+Description: copies: re-include root directory in directory rename detection (issue3511)
+Bug: http://bugs.debian.org/698634
+Bug-mercurial: http://bz.selenic.com/show_bug.cgi?id=3511
+Applied-Upstream: 2.2.3
+
+--- a/mercurial/context.py
++++ b/mercurial/context.py
+@@ -1043,7 +1043,7 @@ class workingctx(changectx):
+                 wlock.release()
+ 
+     def dirs(self):
+-        return self._repo.dirstate.dirs()
++        return set(self._repo.dirstate.dirs())
+ 
+ class workingfilectx(filectx):
+     """A workingfilectx object makes access to data related to a particular
+--- a/mercurial/copies.py
++++ b/mercurial/copies.py
+@@ -308,7 +308,9 @@ def mergecopies(repo, c1, c2, ca):
+ 
+     # generate a directory move map
+     d1, d2 = c1.dirs(), c2.dirs()
+-    invalid = set([""])
++    d1.add('')
++    d2.add('')
++    invalid = set()
+     dirmove = {}
+ 
+     # examine each file copy for a potential directory move, which is

Modified: packages/mercurial/branches/squeeze-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/squeeze-backports/debian/patches/series	2013-02-14 19:16:34 UTC (rev 9440)
+++ packages/mercurial/branches/squeeze-backports/debian/patches/series	2013-02-17 11:21:41 UTC (rev 9441)
@@ -7,3 +7,4 @@
 deb_specific__install-mo-fhs.patch
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
+from_upstream__reinclude_root_directory_in_directory_rename_detection.patch