Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 10436:6cebf27287de
rebase: split line longer than 80 chars
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Fri, 12 Feb 2010 15:17:10 +0100 |
| parents | e433002acb05 |
| children | 6227c8d669d5 86dc21148bdb |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Feb 12 16:04:00 2010 +0100 +++ b/hgext/rebase.py Fri Feb 12 15:17:10 2010 +0100 @@ -169,8 +169,8 @@ rebased = [rev for rev in state if state[rev] != nullmerge] if rebased: if set(repo.changelog.descendants(min(rebased))) - set(state): - ui.warn(_("warning: new changesets detected on source branch, " - "not stripping\n")) + ui.warn(_("warning: new changesets detected " + "on source branch, not stripping\n")) else: repair.strip(ui, repo, repo[min(rebased)].node(), "strip")