Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify a delete case
authorMatt Mackall <mpm@selenic.com>
Mon, 08 Jun 2009 18:14:44 -0500
changeset 8738 8a9899a6327e
parent 8737 a1808b40a8fb
child 8739 226f1005133c
merge: simplify a delete case
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
+++ b/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
@@ -222,7 +222,7 @@
                     act("prompt keep", "a", f)
             else:
                 act("other deleted", "r", f)
-        elif overwrite and n[20:] == "a": # do not erase the working copy
+        elif n[20:] == "a": # only forget locally-added
             act("remote deleted", "f", f)
         else:
             # file is created on branch or in working directory
Mercurial