Mercurial > evolve
changeset 730:ea629193a25e
merge stable into default
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Mon, 03 Jun 2013 15:06:18 +0200 |
| parents | 2e46caeb2890 (current diff) 235a942eba3f (diff) |
| children | 63ce4384be50 |
| files | |
| diffstat | 3 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/debian/changelog Mon Jun 03 15:03:55 2013 +0200 +++ b/debian/changelog Mon Jun 03 15:06:18 2013 +0200 @@ -1,3 +1,9 @@ +mercurial-evolve (3.1.0-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Pierre-Yves David <pierre-yves.david@logilab.fr> Mon, 04 Mar 2013 18:02:15 +0100 + mercurial-evolve (2.1.0-1) UNRELEASED; urgency=low * New upstream release
--- a/debian/rules Mon Jun 03 15:03:55 2013 +0200 +++ b/debian/rules Mon Jun 03 15:06:18 2013 +0200 @@ -9,8 +9,10 @@ .PHONY: build +ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS))) override_dh_auto_test: cd tests && python run-tests.py --with-hg=`which hg` +endif override_dh_python2: # avoid conflict with mercurial's own hgext/__init__.py
--- a/hgext/evolve.py Mon Jun 03 15:03:55 2013 +0200 +++ b/hgext/evolve.py Mon Jun 03 15:06:18 2013 +0200 @@ -887,7 +887,7 @@ % len(troubled)) return 2 else: - ui.write_err(_('no troubled changesets\n')) + ui.write_err(_('no troubled changesets\n')) return 1 while tr is not None: @@ -895,7 +895,7 @@ if not allopt: return result tr = _picknexttroubled(ui, repo, anyopt or allopt) - + def _evolveany(ui, repo, tr, dryrunopt): repo = repo.unfiltered() @@ -1204,7 +1204,7 @@ [], '') def cmdgdown(ui, repo): - """update to parent an display summary lines""" + """update to parent and display summary lines""" wkctx = repo[None] wparents = wkctx.parents() if len(wparents) != 1: @@ -1227,7 +1227,7 @@ [], '') def cmdup(ui, repo): - """update to child an display summary lines""" + """update to child and display summary lines""" wkctx = repo[None] wparents = wkctx.parents() if len(wparents) != 1: @@ -1378,7 +1378,7 @@ @command('amend|refresh', [('A', 'addremove', None, _('mark new/missing files as added/removed before committing')), - ('n', 'note', '', _('use text as commit message for this update')), + ('n', 'note', '', _('use text as commit message for this update (DEPRECATED)')), ('e', 'edit', False, _('invoke editor on commit messages')), ] + walkopts + commitopts + commitopts2, _('[OPTION]... [FILE]...'))