test-bookmarks-rebase.t
105 lines
| 2.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-bookmarks-rebase.t
|
r11863 | $ echo "[extensions]" >> $HGRCPATH | ||
$ echo "rebase=" >> $HGRCPATH | ||||
initialize repository | ||||
$ hg init | ||||
$ echo 'a' > a | ||||
$ hg ci -A -m "0" | ||||
adding a | ||||
$ echo 'b' > b | ||||
$ hg ci -A -m "1" | ||||
adding b | ||||
$ hg up 0 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo 'c' > c | ||||
$ hg ci -A -m "2" | ||||
adding c | ||||
created new head | ||||
$ echo 'd' > d | ||||
$ hg ci -A -m "3" | ||||
adding d | ||||
$ hg bookmark -r 1 one | ||||
$ hg bookmark -r 3 two | ||||
|
r19112 | $ hg up -q two | ||
|
r11863 | |||
bookmark list | ||||
$ hg bookmark | ||||
|
r13388 | one 1:925d80f479bb | ||
|
r11863 | * two 3:2ae46b1d99a7 | ||
rebase | ||||
|
r11907 | $ hg rebase -s two -d one | ||
|
r34291 | rebasing 3:2ae46b1d99a7 "3" (two tip) | ||
|
r35394 | saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-e6b057bc-rebase.hg | ||
|
r11863 | |||
$ hg log | ||||
|
r17005 | changeset: 3:42e5ed2cdcf4 | ||
|
r13386 | bookmark: two | ||
|
r11863 | tag: tip | ||
parent: 1:925d80f479bb | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 3 | ||||
changeset: 2:db815d6d32e6 | ||||
parent: 0:f7b1eb17ad24 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 2 | ||||
changeset: 1:925d80f479bb | ||||
|
r13416 | bookmark: one | ||
|
r11863 | user: test | ||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 1 | ||||
changeset: 0:f7b1eb17ad24 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 0 | ||||
|
r24758 | aborted rebase should restore active bookmark. | ||
$ hg up 1 | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
(leaving bookmark two) | ||||
$ echo 'e' > d | ||||
$ hg ci -A -m "4" | ||||
adding d | ||||
created new head | ||||
$ hg bookmark three | ||||
$ hg rebase -s three -d two | ||||
|
r34291 | rebasing 4:dd7c838e8362 "4" (three tip) | ||
|
r24758 | merging d | ||
|
r26614 | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | ||
|
r24758 | unresolved conflicts (see hg resolve, then hg rebase --continue) | ||
[1] | ||||
$ hg rebase --abort | ||||
rebase aborted | ||||
$ hg bookmark | ||||
one 1:925d80f479bb | ||||
* three 4:dd7c838e8362 | ||||
two 3:42e5ed2cdcf4 | ||||
|
r25101 | after aborted rebase, restoring a bookmark that has been removed should not fail | ||
$ hg rebase -s three -d two | ||||
|
r34291 | rebasing 4:dd7c838e8362 "4" (three tip) | ||
|
r25101 | merging d | ||
|
r26614 | warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | ||
|
r25101 | unresolved conflicts (see hg resolve, then hg rebase --continue) | ||
[1] | ||||
$ hg bookmark -d three | ||||
$ hg rebase --abort | ||||
rebase aborted | ||||
$ hg bookmark | ||||
one 1:925d80f479bb | ||||
two 3:42e5ed2cdcf4 | ||||