Mercurial > hg

changeset 8738:8a9899a6327e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify a delete case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents a1808b40a8fb
children 226f1005133c
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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