Show More
@@ -198,8 +198,6 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
198 | else: # case 2 A,B/B/B or case 4,21 A/B/B |
|
198 | else: # case 2 A,B/B/B or case 4,21 A/B/B | |
199 | act("local copied/moved to " + f2, "m", |
|
199 | act("local copied/moved to " + f2, "m", | |
200 | f, f2, f, fmerge(f, f2, f2), False) |
|
200 | f, f2, f, fmerge(f, f2, f2), False) | |
201 | elif n[20:] == "a": # added, no remote |
|
|||
202 | act("remote deleted", "f", f) |
|
|||
203 | elif f in ma: # clean, a different, no remote |
|
201 | elif f in ma: # clean, a different, no remote | |
204 | if n != ma[f]: |
|
202 | if n != ma[f]: | |
205 | if repo.ui.prompt( |
|
203 | if repo.ui.prompt( | |
@@ -209,6 +207,8 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
209 | act("prompt delete", "r", f) |
|
207 | act("prompt delete", "r", f) | |
210 | else: |
|
208 | else: | |
211 | act("prompt keep", "a", f) |
|
209 | act("prompt keep", "a", f) | |
|
210 | elif n[20:] == "a": # added, no remote | |||
|
211 | act("remote deleted", "f", f) | |||
212 | elif n[20:] != "u": |
|
212 | elif n[20:] != "u": | |
213 | act("other deleted", "r", f) |
|
213 | act("other deleted", "r", f) | |
214 |
|
214 |
General Comments 0
You need to be logged in to leave comments.
Login now