Show More
@@ -169,8 +169,8 b' def rebase(ui, repo, **opts):' | |||
|
169 | 169 | rebased = [rev for rev in state if state[rev] != nullmerge] |
|
170 | 170 | if rebased: |
|
171 | 171 | if set(repo.changelog.descendants(min(rebased))) - set(state): |
|
172 |
ui.warn(_("warning: new changesets detected |
|
|
173 |
|
|
|
172 | ui.warn(_("warning: new changesets detected " | |
|
173 | "on source branch, not stripping\n")) | |
|
174 | 174 | else: |
|
175 | 175 | repair.strip(ui, repo, repo[min(rebased)].node(), "strip") |
|
176 | 176 |
General Comments 0
You need to be logged in to leave comments.
Login now