Bug#698671: unblock: mercurial/2.2.2-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package mercurial
mercurial 2.2.2-2 fixed an important bug[0] by adding a patch from
upstream. It's the only difference with 2.2.2-1, the current version
in wheezy. The debdiff is attached
[0] http://bugs.debian.org/698634
unblock mercurial/2.2.2-2
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/6 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru mercurial-2.2.2/debian/changelog mercurial-2.2.2/debian/changelog
--- mercurial-2.2.2/debian/changelog 2012-06-03 18:21:58.000000000 +0100
+++ mercurial-2.2.2/debian/changelog 2013-01-21 23:33:20.000000000 +0000
@@ -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@debian.org> Mon, 21 Jan 2013 23:33:20 +0000
+
mercurial (2.2.2-1) unstable; urgency=low
* New upstream release
diff -Nru mercurial-2.2.2/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch mercurial-2.2.2/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch
--- mercurial-2.2.2/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch 1970-01-01 01:00:00.000000000 +0100
+++ mercurial-2.2.2/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch 2013-01-21 22:56:37.000000000 +0000
@@ -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
diff -Nru mercurial-2.2.2/debian/patches/series mercurial-2.2.2/debian/patches/series
--- mercurial-2.2.2/debian/patches/series 2012-06-03 18:21:58.000000000 +0100
+++ mercurial-2.2.2/debian/patches/series 2013-01-21 22:55:36.000000000 +0000
@@ -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
Reply to: