Mercurial > hg

diff mercurial/merge.py @ 8518:3f4f14eab085

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update --clean: do not unlink added files (issue575)
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 19 May 2009 03:59:58 +0200
parents 0bf0045000b5
children 3682a19bb637
line wrap: on
line diff
--- a/mercurial/merge.py	Sun May 17 16:25:48 2009 +0200
+++ b/mercurial/merge.py	Tue May 19 03:59:58 2009 +0200
@@ -226,6 +226,8 @@
                 act("prompt keep", "a", f)
             else:
                 act("other deleted", "r", f)
+        elif overwrite and n[20:] == "a": # do not erase the working copy
+            act("remote deleted", "f", f)
         else:
             # file is created on branch or in working directory
             if (overwrite and n[20:] != "u") or (backwards and not n[20:]):