Mercurial > hg-stable
changeset 11164:e84600b0d81b
commit: inform the commiter when resurrecting a closed changeset
| author | Gilles Moris <gilles.moris@free.fr> |
|---|---|
| date | Mon, 10 May 2010 08:53:06 +0200 |
| parents | acd61dc44a39 |
| children | e8915e19205a |
| files | mercurial/commands.py tests/test-branches.out |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon May 10 08:43:36 2010 +0200 +++ b/mercurial/commands.py Mon May 10 08:53:06 2010 +0200 @@ -745,6 +745,11 @@ (parents[1] == nullrev or len(cl.heads(cl.node(parents[1]))) > 1)): ui.status(_('created new head\n')) + if not opts.get('close_branch'): + for r in parents: + if repo[r].extra().get('close'): + ui.status(_('reopening closed branch head %d\n') % r) + if ui.debugflag: ui.write(_('committed changeset %d:%s\n') % (rev, hex(node))) elif ui.verbose:
--- a/tests/test-branches.out Mon May 10 08:43:36 2010 +0200 +++ b/tests/test-branches.out Mon May 10 08:53:06 2010 +0200 @@ -171,6 +171,7 @@ date: Thu Jan 01 00:00:09 1970 +0000 summary: prune bad branch +reopening closed branch head 12 --- branch b is back in action b 13:6ac12926b8c3 a branch name much longer than the default justification used by branches 7:10ff5895aa57