Mercurial > hg
comparison tests/test-bookmarks-merge.t @ 16706:a270ec977ba6
bookmarks: delete divergent bookmarks on merge
author | David Soria Parra <dsp@php.net> |
---|---|
date | Sat, 12 May 2012 21:28:10 +0200 |
parents | |
children | 4a02cf4fbb2e |
comparison
equal
deleted
inserted
replaced
16705:c2d9ef43ff6c | 16706:a270ec977ba6 |
---|---|
1 # init | |
2 | |
3 $ hg init | |
4 $ echo a > a | |
5 $ hg add a | |
6 $ hg commit -m'a' | |
7 $ echo b > b | |
8 $ hg add b | |
9 $ hg commit -m'b' | |
10 $ hg up -C 0 | |
11 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
12 $ echo c > c | |
13 $ hg add c | |
14 $ hg commit -m'c' | |
15 created new head | |
16 | |
17 # test merging of diverged bookmarks | |
18 $ hg bookmark -r 1 "c@diverge" | |
19 $ hg bookmark -r 1 b | |
20 $ hg bookmark c | |
21 $ hg bookmarks | |
22 b 1:d2ae7f538514 | |
23 * c 2:d36c0562f908 | |
24 c@diverge 1:d2ae7f538514 | |
25 $ hg merge "c@diverge" | |
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
27 (branch merge, don't forget to commit) | |
28 $ hg commit -m'merge' | |
29 $ hg bookmarks | |
30 b 1:d2ae7f538514 | |
31 * c 3:b8f96cf4688b |