Mercurial > hg

diff hgext/rebase.py @ 13021:6c800e7ef2f6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: support --detach when null is common ancestor
author Henrik Stuart <hg@hstuart.dk>
date Sat, 20 Nov 2010 09:51:56 +0100
parents b19b4c1df066
children 6bf39d88c857
line wrap: on
line diff
--- a/hgext/rebase.py	Thu Nov 18 19:52:58 2010 -0200
+++ b/hgext/rebase.py	Sat Nov 20 09:51:56 2010 +0100
@@ -485,7 +485,7 @@
             srcancestors = set(repo.changelog.ancestors(source))
             baseancestors = set(repo.changelog.ancestors(commonbase.rev()))
             detachset = srcancestors - baseancestors
-            detachset.remove(commonbase.rev())
+            detachset.discard(commonbase.rev())
     else:
         if base:
             cwd = repo[base].rev()