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

Bug#701600: marked as done (unblock: mercurial/2.2.2-3)

Your message dated Sun, 24 Feb 2013 23:12:46 +0000
with message-id <20130224231246.GB7674@ernie.home.powdarrmonkey.net>
and subject line Re: Bug#701600: unblock: mercurial/2.2.2-3
has caused the Debian Bug report #701600,
regarding unblock: mercurial/2.2.2-3
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.)


-- 
701600: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701600
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, it fixes #701168, an important bug in wheezy[0]

[0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701168

unblock mercurial/2.2.2-3

debdiff against the current version in wheezy:

diff -Nru mercurial-2.2.2/debian/changelog mercurial-2.2.2/debian/changelog
--- mercurial-2.2.2/debian/changelog	2013-01-21 23:33:20.000000000 +0000
+++ mercurial-2.2.2/debian/changelog	2013-02-23 19:53:41.000000000 +0000
@@ -1,3 +1,13 @@
+mercurial (2.2.2-3) unstable; urgency=low
+
+  * Fix "Backport improvement to vimdiff configuration" by adding
+    from_upstream__set_vimdiff_to_check_changed.patch,
+    from_upstream__mergetools_vimdiff_issue_warning.patch and
+    from_upstream__mergetools_refine_vimdiff_warning_message.patch
+    backported from upstream (Closes: #701168)
+
+ -- Javi Merino <vicho@debian.org>  Sat, 23 Feb 2013 19:52:22 +0000
+
 mercurial (2.2.2-2) unstable; urgency=low
 
   * Fix "Please add patch from http://bz.selenic.com/show_bug.cgi?id=3511";
diff -Nru mercurial-2.2.2/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch mercurial-2.2.2/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch
--- mercurial-2.2.2/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch	1970-01-01 01:00:00.000000000 +0100
+++ mercurial-2.2.2/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch	2013-02-23 19:31:52.000000000 +0000
@@ -0,0 +1,21 @@
+Origin: http://hg.intevation.org/mercurial/crew/rev/7d66a44e87ed
+Description: mergetools: refine vimdiff warning message
+ We explicitly redraw before echoing the message so that it simply
+ displays at the bottom of the window. Also simplifies the message
+ printing by using 'echomsg' (which uses 'echohl' internally) and adds
+ the names of the software involved for improved Googleability.
+Bug: http://bugs.debian.org/701168
+
+diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
+--- a/contrib/mergetools.hgrc
++++ b/contrib/mergetools.hgrc
+@@ -15,7 +15,7 @@ gvimdiff.regkeyalt=Software\Wow6432Node\
+ gvimdiff.regname=path
+ gvimdiff.priority=-9
+ 
+-vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge conflict detected, type \":cq\" to abort" | echohl'
++vimdiff.args=$local $other $base -c 'redraw | echomsg "hg merge conflict, type \":cq\" to abort vimdiff"'
+ vimdiff.check=changed
+ vimdiff.priority=-10
+ 
+
diff -Nru mercurial-2.2.2/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch mercurial-2.2.2/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch
--- mercurial-2.2.2/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch	1970-01-01 01:00:00.000000000 +0100
+++ mercurial-2.2.2/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch	2013-02-23 19:31:52.000000000 +0000
@@ -0,0 +1,27 @@
+Origin: http://hg.intevation.org/mercurial/crew/rev/f2b1f78cf202
+Bug: http://bugs.debian.org/701168
+Subject: mergetools: vimdiff issue a warning explaining how to abort
+
+Adds a message displayed at each vimdiff invocation:
+
+  merge conflict detected, type ":cq" to abort
+
+Vimdiff is very confusing for non-vim user (not to speak about vim
+user confused anyway. However it is very likely that vimdiff is picked
+as the mergetool of choice when using the default config:
+- vim is available on all UNIX system.
+- Its one of the rare non graphical merge tools.
+
+diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
+--- a/contrib/mergetools.hgrc
++++ b/contrib/mergetools.hgrc
+@@ -15,7 +15,7 @@ gvimdiff.regkeyalt=Software\Wow6432Node\
+ gvimdiff.regname=path
+ gvimdiff.priority=-9
+ 
+-vimdiff.args=$local $other $base
++vimdiff.args=$local $other $base -c 'echohl WarningMsg | echo "merge conflict detected, type \":cq\" to abort" | echohl'
+ vimdiff.check=changed
+ vimdiff.priority=-10
+ 
+
diff -Nru mercurial-2.2.2/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch mercurial-2.2.2/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch
--- mercurial-2.2.2/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch	1970-01-01 01:00:00.000000000 +0100
+++ mercurial-2.2.2/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch	2013-02-23 19:31:52.000000000 +0000
@@ -0,0 +1,17 @@
+Origin: http://selenic.com/hg/rev/93bc65e970c0
+Description: mergetools.hgrc: set vimdiff to check=changed
+Bug: http://bugs.debian.org/701168
+Applied-Upstream: 2.3.2
+
+diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
+--- a/contrib/mergetools.hgrc
++++ b/contrib/mergetools.hgrc
+@@ -16,6 +16,7 @@ gvimdiff.regname=path
+ gvimdiff.priority=-9
+ 
+ vimdiff.args=$local $other $base
++vimdiff.check=changed
+ vimdiff.priority=-10
+ 
+ merge.checkconflicts=True
+
diff -Nru mercurial-2.2.2/debian/patches/series mercurial-2.2.2/debian/patches/series
--- mercurial-2.2.2/debian/patches/series	2013-01-21 22:55:36.000000000 +0000
+++ mercurial-2.2.2/debian/patches/series	2013-02-23 19:31:52.000000000 +0000
@@ -8,3 +8,6 @@
 deb_specific__disable_libdir_replacement.patch
 deb_specific__fix_hg-ssh_interpreter.patch
 from_upstream__reinclude_root_directory_in_directory_rename_detection.patch
+from_upstream__set_vimdiff_to_check_changed.patch
+from_upstream__mergetools_vimdiff_issue_warning.patch
+from_upstream__mergetools_refine_vimdiff_warning_message.patch

-- System Information:
Debian Release: 7.0
  APT prefers testing
  APT policy: (800, 'testing'), (600, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.2.0-4-686-pae (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

--- End Message ---
--- Begin Message --- 
On Sun, Feb 24, 2013 at 10:12:32PM +0000, Javi Merino wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Please unblock package mercurial, it fixes #701168, an important bug in wheezy[0]
> 
> [0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701168
> 
> unblock mercurial/2.2.2-3

Thanks, unblocked.

-- 
Jonathan Wiltshire                                      jmw@debian.org
Debian Developer                         http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

<directhex> i have six years of solaris sysadmin experience, from
            8->10. i am well qualified to say it is made from bonghits
			layered on top of bonghits

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: