Show More
@@ -853,8 +853,7 b' def applyupdates(repo, actions, wctx, mc' | |||||
853 | """ |
|
853 | """ | |
854 |
|
854 | |||
855 | updated, merged, removed, unresolved = 0, 0, 0, 0 |
|
855 | updated, merged, removed, unresolved = 0, 0, 0, 0 | |
856 | ms = mergestate(repo) |
|
856 | ms = mergestate.clean(repo, wctx.p1().node(), mctx.node()) | |
857 | ms.reset(wctx.p1().node(), mctx.node()) |
|
|||
858 | moves = [] |
|
857 | moves = [] | |
859 | for m, l in actions.items(): |
|
858 | for m, l in actions.items(): | |
860 | l.sort() |
|
859 | l.sort() |
General Comments 0
You need to be logged in to leave comments.
Login now