Show More
@@ -258,6 +258,17 b' def manifestmerge(repo, p1, p2, pa, over' | |||
|
258 | 258 | |
|
259 | 259 | return action |
|
260 | 260 | |
|
261 | def actioncmp(a1, a2): | |
|
262 | m1 = a1[1] | |
|
263 | m2 = a2[1] | |
|
264 | if m1 == m2: | |
|
265 | return cmp(a1, a2) | |
|
266 | if m1 == 'r': | |
|
267 | return -1 | |
|
268 | if m2 == 'r': | |
|
269 | return 1 | |
|
270 | return cmp(a1, a2) | |
|
271 | ||
|
261 | 272 | def applyupdates(repo, action, wctx, mctx): |
|
262 | 273 | "apply the merge action list to the working directory" |
|
263 | 274 | |
@@ -265,7 +276,7 b' def applyupdates(repo, action, wctx, mct' | |||
|
265 | 276 | ms = mergestate(repo) |
|
266 | 277 | ms.reset(wctx.parents()[0].node()) |
|
267 | 278 | moves = [] |
|
268 | action.sort() | |
|
279 | action.sort(actioncmp) | |
|
269 | 280 | |
|
270 | 281 | # prescan for merges |
|
271 | 282 | for a in action: |
@@ -46,9 +46,9 b' resolving manifests' | |||
|
46 | 46 | side2: remote deleted -> r |
|
47 | 47 | side1: remote deleted -> r |
|
48 | 48 | main: remote created -> g |
|
49 | getting main | |
|
50 | 49 | removing side1 |
|
51 | 50 | removing side2 |
|
51 | getting main | |
|
52 | 52 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
53 | 53 | Should only show a main |
|
54 | 54 | a |
General Comments 0
You need to be logged in to leave comments.
Login now