--- a/tests/test-rebase-bookmarks.t	Sun Dec 10 22:39:46 2017 -0800
+++ b/tests/test-rebase-bookmarks.t	Sun Dec 10 21:57:37 2017 -0800
@@ -7,7 +7,7 @@
   > publish=False
   > 
   > [alias]
-  > tglog = log -G --template "{rev}: '{desc}' bookmarks: {bookmarks}\n"
+  > tglog = log -G --template "{rev}: {node|short} '{desc}' bookmarks: {bookmarks}\n"
   > EOF
 
 Create a repo with several bookmarks
@@ -39,13 +39,13 @@
   $ hg book W
 
   $ hg tglog
-  @  3: 'D' bookmarks: W
+  @  3: 41acb9dca9eb 'D' bookmarks: W
   |
-  | o  2: 'C' bookmarks: Y Z
+  | o  2: 49cb3485fa0c 'C' bookmarks: Y Z
   | |
-  | o  1: 'B' bookmarks: X
+  | o  1: 6c81ed0049f8 'B' bookmarks: X
   |/
-  o  0: 'A' bookmarks:
+  o  0: 1994f17a630e 'A' bookmarks:
   
 
 Move only rebased bookmarks
@@ -66,26 +66,26 @@
   $ hg book -r 0 Y@diverge
 
   $ hg tglog
-  o  3: 'D' bookmarks: W X@diverge Z@diverge
+  o  3: 41acb9dca9eb 'D' bookmarks: W X@diverge Z@diverge
   |
-  | @  2: 'C' bookmarks: Y Z
+  | @  2: 49cb3485fa0c 'C' bookmarks: Y Z
   | |
-  | o  1: 'B' bookmarks: X
+  | o  1: 6c81ed0049f8 'B' bookmarks: X
   |/
-  o  0: 'A' bookmarks: Y@diverge
+  o  0: 1994f17a630e 'A' bookmarks: Y@diverge
   
   $ hg rebase -s Y -d 3
   rebasing 2:49cb3485fa0c "C" (Y Z)
   saved backup bundle to $TESTTMP/a1/.hg/strip-backup/49cb3485fa0c-126f3e97-rebase.hg (glob)
 
   $ hg tglog
-  @  3: 'C' bookmarks: Y Z
+  @  3: 17fb3faba63c 'C' bookmarks: Y Z
   |
-  o  2: 'D' bookmarks: W X@diverge
+  o  2: 41acb9dca9eb 'D' bookmarks: W X@diverge
   |
-  | o  1: 'B' bookmarks: X
+  | o  1: 6c81ed0049f8 'B' bookmarks: X
   |/
-  o  0: 'A' bookmarks: Y@diverge
+  o  0: 1994f17a630e 'A' bookmarks: Y@diverge
   
 Do not try to keep active but deleted divergent bookmark
 
@@ -120,13 +120,13 @@
   saved backup bundle to $TESTTMP/a2/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob)
 
   $ hg tglog
-  @  3: 'C' bookmarks: Y Z
+  @  3: 3d5fa227f4b5 'C' bookmarks: Y Z
   |
-  o  2: 'B' bookmarks: X
+  o  2: e926fccfa8ec 'B' bookmarks: X
   |
-  o  1: 'D' bookmarks: W
+  o  1: 41acb9dca9eb 'D' bookmarks: W
   |
-  o  0: 'A' bookmarks:
+  o  0: 1994f17a630e 'A' bookmarks:
   
 
 Keep active bookmark on the correct changeset
@@ -143,13 +143,13 @@
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/6c81ed0049f8-a687065f-rebase.hg (glob)
 
   $ hg tglog
-  o  3: 'C' bookmarks: Y Z
+  o  3: 3d5fa227f4b5 'C' bookmarks: Y Z
   |
-  @  2: 'B' bookmarks: X
+  @  2: e926fccfa8ec 'B' bookmarks: X
   |
-  o  1: 'D' bookmarks: W
+  o  1: 41acb9dca9eb 'D' bookmarks: W
   |
-  o  0: 'A' bookmarks:
+  o  0: 1994f17a630e 'A' bookmarks:
   
   $ hg bookmarks
      W                         1:41acb9dca9eb
@@ -182,15 +182,15 @@
   rebasing 3:3d5fa227f4b5 "C" (Y Z)
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-c6ea2371-rebase.hg (glob)
   $ hg tglog
-  @  4: 'C' bookmarks: Y Z
+  @  4: 45c0f0ec1203 'C' bookmarks: Y Z
   |
-  o  3: 'other C' bookmarks:
+  o  3: b0e10b7175fd 'other C' bookmarks:
   |
-  o  2: 'B' bookmarks: X
+  o  2: e926fccfa8ec 'B' bookmarks: X
   |
-  o  1: 'D' bookmarks: W
+  o  1: 41acb9dca9eb 'D' bookmarks: W
   |
-  o  0: 'A' bookmarks:
+  o  0: 1994f17a630e 'A' bookmarks:
   
 
 ensure that bookmarks given the names of revset functions can be used
@@ -225,21 +225,21 @@
   $ rm .hg/localtags
   $ hg up -q B
   $ hg tglog
-  o  2: 'C' bookmarks: C
+  o  2: dc0947a82db8 'C' bookmarks: C
   |
-  | @  1: 'B' bookmarks: B
+  | @  1: 112478962961 'B' bookmarks: B
   |/
-  o  0: 'A' bookmarks: A
+  o  0: 426bada5c675 'A' bookmarks: A
   
   $ hg rebase -r B -d C --keep
   rebasing 1:112478962961 "B" (B)
   $ hg tglog
-  @  3: 'B' bookmarks: B
+  @  3: 9769fc65c4c5 'B' bookmarks: B
   |
-  o  2: 'C' bookmarks: C
+  o  2: dc0947a82db8 'C' bookmarks: C
   |
-  | o  1: 'B' bookmarks:
+  | o  1: 112478962961 'B' bookmarks:
   |/
-  o  0: 'A' bookmarks: A
+  o  0: 426bada5c675 'A' bookmarks: A