Mercurial > hg
changeset 21027:25ee5dbebc6b
rebase: tell when reopening a closed branch head
Give same 'reopening closed branch head X' message as commit gives.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 26 Nov 2013 03:18:56 +0100 |
| parents | 7ee03e190c1d |
| children | 76f68595ff8e |
| files | hgext/rebase.py tests/test-rebase-named-branches.t |
| diffstat | 2 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Sat Apr 27 23:19:52 2013 +0200 +++ b/hgext/rebase.py Tue Nov 26 03:18:56 2013 +0100 @@ -289,6 +289,9 @@ inclusive=True) external = externalparent(repo, state, targetancestors) + if dest.closesbranch() and not keepbranchesf: + ui.status(_('reopening closed branch head %s\n') % dest) + if keepbranchesf: # insert _savebranch at the start of extrafns so if # there's a user-provided extrafn it can clobber branch if
--- a/tests/test-rebase-named-branches.t Sat Apr 27 23:19:52 2013 +0200 +++ b/tests/test-rebase-named-branches.t Tue Nov 26 03:18:56 2013 +0100 @@ -239,6 +239,17 @@ |/ @ 0: 'A' + +Reopen branch by rebase + + $ hg up -qr3 + $ hg branch -q b + $ hg ci -m 'create b' + $ hg ci -m 'close b' --close + $ hg rebase -b 8 -d b + reopening closed branch head ea9de14a36c6 + saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) + $ cd .. Rebase to other head on branch