Commit 2cfa1399 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

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.

--HG--
branch : stable
parent b723805d7fe1
......@@ -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 @@ importing Parren test
$ 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 @@ We start with a plain base repo::
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 @@ Test
----
$ 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 @@ working on merge commits too
$ 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 @@ working on merge commits too
$ 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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment