Show More
@@ -257,7 +257,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
257 | 257 | f2 = movewithdir[f] |
|
258 | 258 | act("remote renamed directory to " + f2, "d", f, None, f2, |
|
259 | 259 | m1.flags(f)) |
|
260 | elif f in copy: # case 2 A,B/B/B or case 4,21 A/B/B | |
|
260 | elif f in copy: | |
|
261 | 261 | f2 = copy[f] |
|
262 | 262 | act("local copied/moved to " + f2, "m", f, f2, f, False) |
|
263 | 263 | elif f in ma: # clean, a different, no remote |
@@ -285,10 +285,10 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
285 | 285 | m2.flags(f)) |
|
286 | 286 | elif f in copy: |
|
287 | 287 | f2 = copy[f] |
|
288 |
if f2 in m2: |
|
|
288 | if f2 in m2: | |
|
289 | 289 | act("remote copied to " + f, "m", |
|
290 | 290 | f2, f, f, False) |
|
291 |
else: |
|
|
291 | else: | |
|
292 | 292 | act("remote moved to " + f, "m", |
|
293 | 293 | f2, f, f, True) |
|
294 | 294 | elif f not in ma: |
General Comments 0
You need to be logged in to leave comments.
Login now