# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1396905471 -7200
# Node ID 6ae0c41e4b525d9b331db2c089cce660de01da61
# Parent  231ccc08670c3739e67bf606b110639814e78d5e
backout: don't limit heritage check to a single ancestor

This do probably not make any real difference but is slightly more correct and
we would like to get rid of changelog.ancestor.

diff -r 231ccc08670c -r 6ae0c41e4b52 mercurial/commands.py
--- a/mercurial/commands.py	Thu Mar 20 01:35:07 2014 +0100
+++ b/mercurial/commands.py	Mon Apr 07 23:17:51 2014 +0200
@@ -438,8 +438,7 @@
     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)