Mercurial > hg > mercurial-source

changeset 19926:0f99747202f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: preserve active bookmark when not at head (issue3813) Now that the working directory parent is preserved, we can preserve the active bookmark too.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Mon, 14 Oct 2013 17:12:59 +0200
parents 9c78ed396075
children 76c83107a724
files hgext/rebase.py tests/test-rebase-bookmarks.t
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -382,7 +382,7 @@
             ui.note(_("%d revisions have been skipped\n") % len(skipped))
 
         if (activebookmark and
-            repo['tip'].node() == repo._bookmarks[activebookmark]):
+            repo['.'].node() == repo._bookmarks[activebookmark]):
                 bookmarks.setcurrent(repo, activebookmark)
 
     finally:
--- a/tests/test-rebase-bookmarks.t
+++ b/tests/test-rebase-bookmarks.t
@@ -127,6 +127,12 @@
   |
   o  0: 'A' bookmarks:
   
+  $ hg bookmarks
+     W                         1:41acb9dca9eb
+   * X                         2:e926fccfa8ec
+     Y                         3:3d5fa227f4b5
+     Z                         3:3d5fa227f4b5
+
 rebase --continue with bookmarks present (issue3802)
 
   $ hg up 2