Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: tell when reopening a closed branch head
authorMads Kiilerich <madski@unity3d.com>
Tue, 26 Nov 2013 03:18:56 +0100
changeset 21027 25ee5dbebc6b
parent 21026 7ee03e190c1d
child 21029 76f68595ff8e
rebase: tell when reopening a closed branch head Give same 'reopening closed branch head X' message as commit gives.
hgext/rebase.py file | annotate | diff | comparison | revisions
tests/test-rebase-named-branches.t file | annotate | diff | comparison | revisions 
--- 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
Mercurial