Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: mark kept local files as readded on linear update (issue539)
authorMatt Mackall <mpm@selenic.com>
Sun, 15 Feb 2009 10:50:48 -0600
changeset 7768 5bf5fd1e2a74
parent 7767 b2410ed2cbe9
child 7769 8c06d4bf2c23
merge: mark kept local files as readded on linear update (issue539)
mercurial/merge.py file | annotate | diff | comparison | revisions
tests/test-rename-merge2.out file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Mon Feb 09 07:55:42 2009 -0600
+++ b/mercurial/merge.py	Sun Feb 15 10:50:48 2009 -0600
@@ -220,6 +220,7 @@
                       "use (c)hanged version or (d)elete?") % f,
                     _("[cd]"), _("c")) == _("d"):
                     act("prompt delete", "r", f)
+                act("prompt keep", "a", f)
             else:
                 act("other deleted", "r", f)
         else:
@@ -367,6 +368,9 @@
                 repo.dirstate.remove(f)
             else:
                 repo.dirstate.forget(f)
+        elif m == "a": # re-add
+            if not branchmerge:
+                repo.dirstate.add(f)
         elif m == "f": # forget
             repo.dirstate.forget(f)
         elif m == "e": # exec change
--- a/tests/test-rename-merge2.out	Mon Feb 09 07:55:42 2009 -0600
+++ b/tests/test-rename-merge2.out	Sun Feb 15 10:50:48 2009 -0600
@@ -484,6 +484,7 @@
   searching for copies back to rev 1
  local changed a which remote deleted
 use (c)hanged version or (d)elete? c
+ a: prompt keep -> a
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
hg-stable