Show More
@@ -220,6 +220,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
220 | "use (c)hanged version or (d)elete?") % f, |
|
220 | "use (c)hanged version or (d)elete?") % f, | |
221 | _("[cd]"), _("c")) == _("d"): |
|
221 | _("[cd]"), _("c")) == _("d"): | |
222 | act("prompt delete", "r", f) |
|
222 | act("prompt delete", "r", f) | |
|
223 | act("prompt keep", "a", f) | |||
223 | else: |
|
224 | else: | |
224 | act("other deleted", "r", f) |
|
225 | act("other deleted", "r", f) | |
225 | else: |
|
226 | else: | |
@@ -367,6 +368,9 b' def recordupdates(repo, action, branchme' | |||||
367 | repo.dirstate.remove(f) |
|
368 | repo.dirstate.remove(f) | |
368 | else: |
|
369 | else: | |
369 | repo.dirstate.forget(f) |
|
370 | repo.dirstate.forget(f) | |
|
371 | elif m == "a": # re-add | |||
|
372 | if not branchmerge: | |||
|
373 | repo.dirstate.add(f) | |||
370 | elif m == "f": # forget |
|
374 | elif m == "f": # forget | |
371 | repo.dirstate.forget(f) |
|
375 | repo.dirstate.forget(f) | |
372 | elif m == "e": # exec change |
|
376 | elif m == "e": # exec change |
@@ -484,6 +484,7 b' resolving manifests' | |||||
484 | searching for copies back to rev 1 |
|
484 | searching for copies back to rev 1 | |
485 | local changed a which remote deleted |
|
485 | local changed a which remote deleted | |
486 | use (c)hanged version or (d)elete? c |
|
486 | use (c)hanged version or (d)elete? c | |
|
487 | a: prompt keep -> a | |||
487 | b: versions differ -> m |
|
488 | b: versions differ -> m | |
488 | rev: versions differ -> m |
|
489 | rev: versions differ -> m | |
489 | preserving b for resolve of b |
|
490 | preserving b for resolve of b |
General Comments 0
You need to be logged in to leave comments.
Login now