Mercurial > evolve
changeset 708:0ff2251adfe0
evolve: clean up help message
| author | Levi Bard <levi@unity3d.com> |
|---|---|
| date | Sat, 09 Feb 2013 18:07:49 +0100 |
| parents | f914e315b717 |
| children | 79a1d2816bdb 2bd6016de593 |
| files | hgext/evolve.py |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Sat Feb 09 18:07:36 2013 +0100 +++ b/hgext/evolve.py Sat Feb 09 18:07:49 2013 +0100 @@ -866,19 +866,19 @@ - rebase unstable changeset to make it stable again, - create proper diff from bumped changeset, - - merge divergent changeset. + - merge divergent changesets. - By default, take the first troubles changeset that looks relevant. + By default, take the first trouble changeset that looks relevant. (The logic is still a bit fuzzy) - - For unstable, that mean the first which could be rebased as child of the - working directory parent revision or one of its descendants and rebase - it. + - For unstable, this means taking the first which could be rebased as a + child of the working directory parent revision or one of its descendants + and rebasing it. - - For divergent this mean "." if applicable. + - For divergent, this means taking "." if applicable. - With --any, evolve pick any troubled changeset to solve + With --any, evolve picks any troubled changeset to solve. The working directory is updated to the newly created revision. """ @@ -905,7 +905,7 @@ % len(troubled)) return 2 else: - ui.write_err(_('no troubled changeset\n')) + ui.write_err(_('no troubled changesets\n')) return 1 while tr is not None: