[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#698671: marked as done (unblock: mercurial/2.2.2-2)

Your message dated Tue, 22 Jan 2013 14:31:48 +0100
with message-id <50FE94C4.5040400@thykier.net>
and subject line Re: Bug#698671: unblock: mercurial/2.2.2-2
has caused the Debian Bug report #698671,
regarding unblock: mercurial/2.2.2-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
698671: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698671
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
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

--- End Message ---
--- Begin Message --- 
On 2013-01-22 01:05, Javi Merino wrote:
> 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
> 
> [...]

Unblocked, thanks.

~Niels

--- End Message ---
Reply to: