[Python-apps-commits] r9826 - in packages/mercurial/branches/wheezy-backports/debian (6 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Tue Jul 2 21:10:24 UTC 2013
Date: Tuesday, July 2, 2013 @ 21:10:22
Author: vicho
Revision: 9826
Delete patches
from_upstream__reinclude_root_directory_in_directory_rename_detectio
n.patch, from_upstream__set_vimdiff_to_check_changed.patch,
from_upstream__mergetools_vimdiff_issue_warning.patch and
from_upstream__mergetools_refine_vimdiff_warning_message.patch which
were backported to wheezy and are now included upstream
Modified:
packages/mercurial/branches/wheezy-backports/debian/changelog
packages/mercurial/branches/wheezy-backports/debian/patches/series
Deleted:
packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch
packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch
packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch
packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch
Modified: packages/mercurial/branches/wheezy-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/changelog 2013-07-02 20:58:59 UTC (rev 9825)
+++ packages/mercurial/branches/wheezy-backports/debian/changelog 2013-07-02 21:10:22 UTC (rev 9826)
@@ -1,6 +1,12 @@
mercurial (2.6.2-1~bpo70+1) wheezy-backports; urgency=low
* Rebuild for wheezy-backports.
+ * Delete patches
+ from_upstream__reinclude_root_directory_in_directory_rename_detectio
+ n.patch, from_upstream__set_vimdiff_to_check_changed.patch,
+ from_upstream__mergetools_vimdiff_issue_warning.patch and
+ from_upstream__mergetools_refine_vimdiff_warning_message.patch which
+ were backported to wheezy and are now included upstream
-- Javi Merino <vicho at debian.org> Tue, 02 Jul 2013 21:57:41 +0100
Deleted: packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch 2013-07-02 20:58:59 UTC (rev 9825)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__mergetools_refine_vimdiff_warning_message.patch 2013-07-02 21:10:22 UTC (rev 9826)
@@ -1,21 +0,0 @@
-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
-
-
Deleted: packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch 2013-07-02 20:58:59 UTC (rev 9825)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__mergetools_vimdiff_issue_warning.patch 2013-07-02 21:10:22 UTC (rev 9826)
@@ -1,27 +0,0 @@
-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
-
-
Deleted: packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch 2013-07-02 20:58:59 UTC (rev 9825)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__reinclude_root_directory_in_directory_rename_detection.patch 2013-07-02 21:10:22 UTC (rev 9826)
@@ -1,30 +0,0 @@
-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
Deleted: packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch 2013-07-02 20:58:59 UTC (rev 9825)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/from_upstream__set_vimdiff_to_check_changed.patch 2013-07-02 21:10:22 UTC (rev 9826)
@@ -1,17 +0,0 @@
-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
-
Modified: packages/mercurial/branches/wheezy-backports/debian/patches/series
===================================================================
--- packages/mercurial/branches/wheezy-backports/debian/patches/series 2013-07-02 20:58:59 UTC (rev 9825)
+++ packages/mercurial/branches/wheezy-backports/debian/patches/series 2013-07-02 21:10:22 UTC (rev 9826)
@@ -7,7 +7,3 @@
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
-from_upstream__set_vimdiff_to_check_changed.patch
-from_upstream__mergetools_vimdiff_issue_warning.patch
-from_upstream__mergetools_refine_vimdiff_warning_message.patch
More information about the Python-apps-commits
mailing list