Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 19987:ba6486076429 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: move forgets to the beginning of the action list Forgets need to be in the beginning of the action list, same as removes. This lets us avoid clashes in the dirstate where a directory is forgotten and a file with the same name is added, or vice versa.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 06 Nov 2013 10:20:18 -0800
parents d51c4d85ec23
children 20ef533ffb01
line wrap: on
line diff
--- a/mercurial/merge.py	Fri Nov 01 17:08:06 2013 -0700
+++ b/mercurial/merge.py	Wed Nov 06 10:20:18 2013 -0800
@@ -384,7 +384,7 @@
     return actions
 
 def actionkey(a):
-    return a[1] == "r" and -1 or 0, a
+    return a[1] in "rf" and -1 or 0, a
 
 def getremove(repo, mctx, overwrite, args):
     """apply usually-non-interactive updates to the working directory