Mercurial > hg
comparison tests/test-bookmarks-rebase.t @ 25101:91c2278c68a3 stable
rebase: check that the bookmark is still valid when restoring (issue4669)
After a rebase --abort, we attempt to restore the previously active
bookmark. We need to ensure that the bookmark still exists.
| author | Tony Tung <tonytung@fb.com> |
|---|---|
| date | Thu, 14 May 2015 21:35:06 -0700 |
| parents | d7451adc72f6 |
| children | ef1eb6df7071 |
comparison
equal
deleted
inserted
replaced
| 25094:8b99e9a8db05 | 25101:91c2278c68a3 |
|---|---|
| 88 $ hg bookmark | 88 $ hg bookmark |
| 89 one 1:925d80f479bb | 89 one 1:925d80f479bb |
| 90 * three 4:dd7c838e8362 | 90 * three 4:dd7c838e8362 |
| 91 two 3:42e5ed2cdcf4 | 91 two 3:42e5ed2cdcf4 |
| 92 | 92 |
| 93 after aborted rebase, restoring a bookmark that has been removed should not fail | |
| 94 | |
| 95 $ hg rebase -s three -d two | |
| 96 rebasing 4:dd7c838e8362 "4" (tip three) | |
| 97 merging d | |
| 98 warning: conflicts during merge. | |
| 99 merging d incomplete! (edit conflicts, then use 'hg resolve --mark') | |
| 100 unresolved conflicts (see hg resolve, then hg rebase --continue) | |
| 101 [1] | |
| 102 $ hg bookmark -d three | |
| 103 $ hg rebase --abort | |
| 104 rebase aborted | |
| 105 $ hg bookmark | |
| 106 one 1:925d80f479bb | |
| 107 two 3:42e5ed2cdcf4 |