Show More
@@ -247,15 +247,14 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
247 | 247 | else: # case 3,20 A/B/A |
|
248 | 248 | act("remote moved to " + f, "m", |
|
249 | 249 | f2, f, f, fmerge(f2, f, f2), True) |
|
250 | elif f in ma: | |
|
251 | if n != ma[f]: | |
|
250 | elif f not in ma: | |
|
251 | act("remote created", "g", f, m2.flags(f)) | |
|
252 | elif n != ma[f]: | |
|
252 | 253 |
|
|
253 | 254 |
|
|
254 | 255 |
|
|
255 | 256 |
|
|
256 | 257 |
|
|
257 | else: | |
|
258 | act("remote created", "g", f, m2.flags(f)) | |
|
259 | 258 | |
|
260 | 259 | return action |
|
261 | 260 |
General Comments 0
You need to be logged in to leave comments.
Login now