Mercurial > hg

changeset 27745:d3a128e8604a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: create a new variable to make the next patch more legible
author Laurent Charignon <lcharignon@fb.com>
date Wed, 06 Jan 2016 12:55:56 -0800
parents f2b8b4e2de20
children f0e9f38d250f
files hgext/rebase.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Jan 06 12:55:56 2016 -0800
+++ b/hgext/rebase.py	Wed Jan 06 12:55:56 2016 -0800
@@ -348,11 +348,12 @@
                 obsoletenotrebased = _computeobsoletenotrebased(repo,
                                                                 rebaseobsrevs,
                                                                 dest)
+                rebaseobsskipped = set(obsoletenotrebased)
 
                 # - plain prune (no successor) changesets are rebased
                 # - split changesets are not rebased if at least one of the
                 # changeset resulting from the split is an ancestor of dest
-                rebaseset = rebasesetrevs - set(obsoletenotrebased)
+                rebaseset = rebasesetrevs - rebaseobsskipped
                 if rebasesetrevs and not rebaseset:
                     msg = _('all requested changesets have equivalents '
                             'or were marked as obsolete')