test-rebase-bookmarks.t
201 lines
| 3.9 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-bookmarks.t
|
r14884 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> 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' | ||||
|
r17346 | |||
|
r14884 | $ 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 | ||
|
r17345 | $ hg tglog | ||
|
r17046 | @ 3: 'D' bookmarks: W | ||
|
r14884 | | | ||
| o 2: 'C' bookmarks: Y Z | ||||
| | | ||||
| o 1: 'B' bookmarks: X | ||||
|/ | ||||
o 0: 'A' bookmarks: | ||||
|
r17346 | |||
|
r14884 | Move only rebased bookmarks | ||
$ cd .. | ||||
$ hg clone -q a a1 | ||||
$ cd a1 | ||||
$ hg up -q Z | ||||
|
r18514 | Test deleting divergent bookmarks from dest (issue3685) | ||
$ hg book -r 3 Z@diverge | ||||
... and also test that bookmarks not on dest or not being moved aren't deleted | ||||
$ hg book -r 3 X@diverge | ||||
$ hg book -r 0 Y@diverge | ||||
$ hg tglog | ||||
o 3: 'D' bookmarks: W X@diverge Z@diverge | ||||
| | ||||
| @ 2: 'C' bookmarks: Y Z | ||||
| | | ||||
| o 1: 'B' bookmarks: X | ||||
|/ | ||||
o 0: 'A' bookmarks: Y@diverge | ||||
|
r17005 | $ hg rebase -s Y -d 3 | ||
|
r14884 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | ||
|
r17345 | $ hg tglog | ||
|
r14884 | @ 3: 'C' bookmarks: Y Z | ||
| | ||||
|
r18514 | o 2: 'D' bookmarks: W X@diverge | ||
|
r14884 | | | ||
| o 1: 'B' bookmarks: X | ||||
|/ | ||||
|
r18514 | o 0: 'A' bookmarks: Y@diverge | ||
|
r14884 | |||
|
r20523 | Do not try to keep active but deleted divergent bookmark | ||
$ cd .. | ||||
$ hg clone -q a a4 | ||||
$ cd a4 | ||||
$ hg up -q 2 | ||||
$ hg book W@diverge | ||||
$ hg rebase -s W -d . | ||||
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) | ||||
$ hg bookmarks | ||||
W 3:0d3554f74897 | ||||
X 1:6c81ed0049f8 | ||||
Y 2:49cb3485fa0c | ||||
Z 2:49cb3485fa0c | ||||
|
r14884 | 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) | ||||
|
r17345 | $ hg tglog | ||
|
r14884 | @ 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 | ||||
|
r19925 | o 3: 'C' bookmarks: Y Z | ||
|
r17046 | | | ||
|
r19925 | @ 2: 'B' bookmarks: X | ||
|
r17046 | | | ||
o 1: 'D' bookmarks: W | ||||
| | ||||
o 0: 'A' bookmarks: | ||||
|
r19926 | $ hg bookmarks | ||
W 1:41acb9dca9eb | ||||
* X 2:e926fccfa8ec | ||||
Y 3:3d5fa227f4b5 | ||||
Z 3:3d5fa227f4b5 | ||||
|
r18549 | rebase --continue with bookmarks present (issue3802) | ||
$ hg up 2 | ||||
|
r19925 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r21404 | (leaving bookmark X) | ||
|
r18549 | $ echo 'C' > c | ||
$ hg add c | ||||
$ hg ci -m 'other C' | ||||
created new head | ||||
$ hg up 3 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg rebase | ||||
merging c | ||||
warning: conflicts during merge. | ||||
merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | ||||
|
r18933 | unresolved conflicts (see hg resolve, then hg rebase --continue) | ||
|
r18935 | [1] | ||
|
r18549 | $ echo 'c' > c | ||
$ hg resolve --mark c | ||||
|
r21947 | (no more unresolved files) | ||
|
r18549 | $ hg rebase --continue | ||
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob) | ||||
$ hg tglog | ||||
@ 4: 'C' bookmarks: Y Z | ||||
| | ||||
o 3: 'other C' bookmarks: | ||||
| | ||||
o 2: 'B' bookmarks: X | ||||
| | ||||
o 1: 'D' bookmarks: W | ||||
| | ||||
o 0: 'A' bookmarks: | ||||
|
r17046 | |||
|
r19641 | ensure that bookmarks given the names of revset functions can be used | ||
as --rev arguments (issue3950) | ||||
$ hg update -q 3 | ||||
$ echo bimble > bimble | ||||
$ hg add bimble | ||||
$ hg commit -q -m 'bisect' | ||||
$ echo e >> bimble | ||||
$ hg ci -m bisect2 | ||||
$ echo e >> bimble | ||||
$ hg ci -m bisect3 | ||||
$ hg book bisect | ||||
$ hg update -q Y | ||||
$ hg rebase -r '"bisect"^^::"bisect"^' -r bisect -d Z | ||||
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/345c90f326a4-backup.hg (glob) | ||||