test-rebase-bookmarks.t
113 lines
| 1.6 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-bookmarks.t
|
r14884 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> graphlog= | ||||
> rebase= | ||||
> | ||||
|
r15742 | > [phases] | ||
> publish=False | ||||
> | ||||
|
r14884 | > [alias] | ||
> tglog = log -G --template "{rev}: '{desc}' bookmarks: {bookmarks}\n" | ||||
> EOF | ||||
Create a repo with several bookmarks | ||||
$ hg init a | ||||
$ cd a | ||||
$ echo a > a | ||||
$ hg ci -Am A | ||||
adding a | ||||
$ echo b > b | ||||
$ hg ci -Am B | ||||
adding b | ||||
$ hg book 'X' | ||||
$ hg book 'Y' | ||||
$ echo c > c | ||||
$ hg ci -Am C | ||||
adding c | ||||
$ hg book 'Z' | ||||
$ hg up -q 0 | ||||
$ echo d > d | ||||
$ hg ci -Am D | ||||
adding d | ||||
created new head | ||||
|
r17046 | $ hg book W | ||
|
r14884 | $ hg tglog | ||
|
r17046 | @ 3: 'D' bookmarks: W | ||
|
r14884 | | | ||
| o 2: 'C' bookmarks: Y Z | ||||
| | | ||||
| o 1: 'B' bookmarks: X | ||||
|/ | ||||
o 0: 'A' bookmarks: | ||||
Move only rebased bookmarks | ||||
$ cd .. | ||||
$ hg clone -q a a1 | ||||
$ cd a1 | ||||
$ hg up -q Z | ||||
|
r17005 | $ hg rebase -s Y -d 3 | ||
|
r14884 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | ||
$ hg tglog | ||||
@ 3: 'C' bookmarks: Y Z | ||||
| | ||||
|
r17046 | o 2: 'D' bookmarks: W | ||
|
r14884 | | | ||
| o 1: 'B' bookmarks: X | ||||
|/ | ||||
o 0: 'A' bookmarks: | ||||
Keep bookmarks to the correct rebased changeset | ||||
$ cd .. | ||||
$ hg clone -q a a2 | ||||
$ cd a2 | ||||
$ hg up -q Z | ||||
$ hg rebase -s 1 -d 3 | ||||
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | ||||
$ hg tglog | ||||
@ 3: 'C' bookmarks: Y Z | ||||
| | ||||
o 2: 'B' bookmarks: X | ||||
| | ||||
|
r17046 | o 1: 'D' bookmarks: W | ||
|
r14884 | | | ||
o 0: 'A' bookmarks: | ||||
|
r17046 | |||
Keep active bookmark on the correct changeset | ||||
$ cd .. | ||||
$ hg clone -q a a3 | ||||
$ cd a3 | ||||
$ hg up -q X | ||||
$ hg rebase -d W | ||||
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) | ||||
$ hg tglog | ||||
@ 3: 'C' bookmarks: Y Z | ||||
| | ||||
o 2: 'B' bookmarks: X | ||||
| | ||||
o 1: 'D' bookmarks: W | ||||
| | ||||
o 0: 'A' bookmarks: | ||||
$ cd .. | ||||