##// END OF EJS Templates
rebase: split line longer than 80 chars
Stefano Tortarolo -
r10436:6cebf272 default
parent child Browse files
Show More
@@ -169,8 +169,8 b' def rebase(ui, repo, **opts):'
169 rebased = [rev for rev in state if state[rev] != nullmerge]
169 rebased = [rev for rev in state if state[rev] != nullmerge]
170 if rebased:
170 if rebased:
171 if set(repo.changelog.descendants(min(rebased))) - set(state):
171 if set(repo.changelog.descendants(min(rebased))) - set(state):
172 ui.warn(_("warning: new changesets detected on source branch, "
172 ui.warn(_("warning: new changesets detected "
173 "not stripping\n"))
173 "on source branch, not stripping\n"))
174 else:
174 else:
175 repair.strip(ui, repo, repo[min(rebased)].node(), "strip")
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