merge: mark kept local files as readded on linear update (issue539)

mercurial/merge.py

@@ -220,6 +220,7 b' def manifestmerge(repo, p1, p2, pa, over'
                       "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 b' def recordupdates(repo, action, branchme'
                 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

tests/test-rename-merge2.out

@@ -484,6 +484,7 b' resolving manifests'
   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