Submitter | Mads Kiilerich |
---|---|
Date | April 7, 2014, 9:18 p.m. |
Message ID | <c13578458af167096db8.1396905499@mk-desktop> |
Download | mbox | patch |
Permalink | /patch/4258/ |
State | Accepted |
Commit | 6ae0c41e4b525d9b331db2c089cce660de01da61 |
Headers | show |
Comments
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -438,8 +438,7 @@ def backout(ui, repo, node=None, rev=Non node = scmutil.revsingle(repo, rev).node() op1, op2 = repo.dirstate.parents() - a = repo.changelog.ancestor(op1, node) - if a != node: + if node not in repo.changelog.commonancestors(op1, node): raise util.Abort(_('cannot backout change that is not an ancestor')) p1, p2 = repo.changelog.parents(node)