Mercurial > hg > mercurial-crew

diff hgext/rebase.py @ 15469:ad336e093a59 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: ensure target is not taken as external (issue3085) This could happen in specific situations in which 'target' was selected as external and used for p1 _and_ p2.
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Tue, 08 Nov 2011 17:09:48 +0100
parents 3411a83e232a
children f520c9616db5 e4fc0f0b4f7e
line wrap: on
line diff
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -215,6 +215,7 @@
                 originalwd, target, state = result
                 if collapsef:
                     targetancestors = set(repo.changelog.ancestors(target))
+                    targetancestors.add(target)
                     external = checkexternal(repo, state, targetancestors)
 
         if keepbranchesf: