# HG changeset patch # User Gilles Moris <gill...@free.fr> # Date 1273474386 -7200 # Node ID fc60860d838f205830014de60bf9eba1bb65735d # Parent fb42a17f51be019620d18aa277182a92e79d2d7b commit: inform the commiter when resurrecting a closed changeset

diff -r fb42a17f51be -r fc60860d838f mercurial/commands.py --- 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: diff -r fb42a17f51be -r fc60860d838f tests/test-branches.out --- 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