diff tests/test-metaedit.t @ 5508:65622482cc9d

tests: show how metaedit doesn't update bookmarks

I also took the liberty to change the log templates a little in the
test because I needed the `gluf` alias to include the bookmark.

--- a/tests/test-metaedit.t	Wed Aug 26 14:09:09 2020 +0200
+++ b/tests/test-metaedit.t	Tue Aug 25 22:50:28 2020 -0700
@@ -3,7 +3,7 @@
   $ cat >> $HGRCPATH <<EOF
   > [alias]
   > glog = log -GT "{rev}:{node|short}@{branch}({phase}) {desc|firstline}"
-  > gluf = log -GT "{rev}: {desc|firstline} - {author|user} ({files})"
+  > gluf = log -GT "{separate(' ', rev, bookmarks)}: {desc|firstline} - {author|user} ({files})"
   > [extensions]
   > evolve =
   > EOF
@@ -14,7 +14,7 @@
 
   $ cat << EOF >> $HGRCPATH
   > [ui]
-  > logtemplate = "{rev}\t{bookmarks}: {desc|firstline} - {author|user}\n"
+  > logtemplate = "{separate(' ', rev, bookmarks)}: {desc|firstline} - {author|user}\n"
   > EOF
 
 HG METAEDIT
@@ -36,9 +36,11 @@
   created new head
   $ mkcommit "D"
   $ echo "D'" > D
+  $ hg bookmark bookmark-D
   $ hg amend -m "D2"
   $ hg up "desc(C)"
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  (leaving bookmark bookmark-D)
   $ mkcommit "E"
   created new head
   $ mkcommit "F"
@@ -47,19 +49,19 @@
 ----
 
   $ hg log -G
-  @  7	: F - test
+  @  7: F - test
   |
-  o  6	: E - test
+  o  6: E - test
   |
-  | o  5	: D2 - test
+  | o  5 bookmark-D: D2 - test
   |/
-  o  3	: C - test
+  o  3: C - test
   |
-  | o  2	: B - test
+  | o  2: B - test
   |/
-  o  1	: A - test
+  o  1: A - test
   |
-  o  0	: ROOT - test
+  o  0: ROOT - test
   
   $ hg update --clean .
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -242,7 +244,7 @@
   $ hg gluf
   @    14: merge commit - someone-else ()
   |\
-  | o  12: D2 - foobar3 (D)
+  | o  12 bookmark-D: D2 - foobar3 (D)
   | |
   o |  11: E - foobar2 (E F)
   |/
@@ -265,6 +267,10 @@
   $ hg gluf
   @  15: squashed - mr-squasher (C D E F)
   |
+  | x  12 bookmark-D: D2 - foobar3 (D)
+  | |
+  | x  3: C - test (C)
+  |/
   | o  2: B - test (B)
   |/
   o  1: A - test (A)