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