Show More
@@ -438,7 +438,7 b' def backout(ui, repo, node=None, rev=Non' | |||||
438 | node = scmutil.revsingle(repo, rev).node() |
|
438 | node = scmutil.revsingle(repo, rev).node() | |
439 |
|
439 | |||
440 | op1, op2 = repo.dirstate.parents() |
|
440 | op1, op2 = repo.dirstate.parents() | |
441 | if node not in repo.changelog.commonancestors(op1, node): |
|
441 | if node not in repo.changelog.commonancestorsheads(op1, node): | |
442 | raise util.Abort(_('cannot backout change that is not an ancestor')) |
|
442 | raise util.Abort(_('cannot backout change that is not an ancestor')) | |
443 |
|
443 | |||
444 | p1, p2 = repo.changelog.parents(node) |
|
444 | p1, p2 = repo.changelog.parents(node) |
General Comments 0
You need to be logged in to leave comments.
Login now