Show More
@@ -179,13 +179,13 b' def uncommit(ui, repo, *pats, **opts):' | |||||
179 | # Fully removed the old commit |
|
179 | # Fully removed the old commit | |
180 | mapping[old.node()] = () |
|
180 | mapping[old.node()] = () | |
181 |
|
181 | |||
182 | scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True) |
|
|||
183 |
|
||||
184 | with repo.dirstate.parentchange(): |
|
182 | with repo.dirstate.parentchange(): | |
185 | repo.dirstate.setparents(newid, node.nullid) |
|
183 | repo.dirstate.setparents(newid, node.nullid) | |
186 | s = old.p1().status(old, match=match) |
|
184 | s = old.p1().status(old, match=match) | |
187 | _fixdirstate(repo, old, repo[newid], s) |
|
185 | _fixdirstate(repo, old, repo[newid], s) | |
188 |
|
186 | |||
|
187 | scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True) | |||
|
188 | ||||
189 | def predecessormarkers(ctx): |
|
189 | def predecessormarkers(ctx): | |
190 | """yields the obsolete markers marking the given changeset as a successor""" |
|
190 | """yields the obsolete markers marking the given changeset as a successor""" | |
191 | for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()): |
|
191 | for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()): |
General Comments 0
You need to be logged in to leave comments.
Login now