Show More
@@ -128,8 +128,7 def rebase(ui, repo, **opts): | |||
|
128 | 128 | |
|
129 | 129 | if not keepf: |
|
130 | 130 | # Remove no more useful revisions |
|
131 |
if |
|
|
132 | - set(state.keys())): | |
|
131 | if set(repo.changelog.descendants(min(state))) - set(state): | |
|
133 | 132 | ui.warn(_("warning: new changesets detected on source branch, " |
|
134 | 133 | "not stripping\n")) |
|
135 | 134 | else: |
@@ -678,7 +678,7 class revlog(object): | |||
|
678 | 678 | # find from roots. |
|
679 | 679 | heads = dict.fromkeys(heads, 0) |
|
680 | 680 | # Start at the top and keep marking parents until we're done. |
|
681 |
nodestotag = set(heads |
|
|
681 | nodestotag = set(heads) | |
|
682 | 682 | # Remember where the top was so we can use it as a limit later. |
|
683 | 683 | highestrev = max([self.rev(n) for n in nodestotag]) |
|
684 | 684 | while nodestotag: |
General Comments 0
You need to be logged in to leave comments.
Login now