Mercurial > hg

changeset 17435:c954447336e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 31 Aug 2012 23:42:02 +0200
parents 038f4f0439d7 (current diff) 63e9b0732518 (diff)
children 4986cb7a8f6e
files
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/mergetools.hgrc	Thu Aug 30 22:13:24 2012 +0200
+++ b/contrib/mergetools.hgrc	Fri Aug 31 23:42:02 2012 +0200
@@ -16,6 +16,7 @@
 gvimdiff.priority=-9
 
 vimdiff.args=$local $other $base
+vimdiff.check=changed
 vimdiff.priority=-10
 
 merge.checkconflicts=True
--- a/mercurial/repair.py	Thu Aug 30 22:13:24 2012 +0200
+++ b/mercurial/repair.py	Fri Aug 31 23:42:02 2012 +0200
@@ -111,9 +111,8 @@
         saverevs.difference_update(descendants)
     savebases = [cl.node(r) for r in saverevs]
     stripbases = [cl.node(r) for r in tostrip]
-    rset = ' or '.join([str(r) for r in tostrip])
-    newbmtarget = repo.revs('sort(heads(ancestors(%r) - (%r)), -rev)',
-                            rset, rset)
+    newbmtarget = repo.revs('sort(heads((::%ld) - (%ld)), -rev)',
+                            tostrip, tostrip)
     if newbmtarget:
         newbmtarget = newbmtarget[0]
     else: