Mercurial > hg
comparison tests/test-issue1877.t @ 13806:8ba08a16e4e0
bookmarks: do not forward merged bookmark (issue1877)
author | David Soria Parra <dsp@php.net> |
---|---|
date | Mon, 14 Mar 2011 23:50:28 +0100 |
parents | |
children | f2719b387380 |
comparison
equal
deleted
inserted
replaced
13805:0bc7b1661177 | 13806:8ba08a16e4e0 |
---|---|
1 http://mercurial.selenic.com/bts/issue1877 | |
2 | |
3 $ hg init a | |
4 $ cd a | |
5 $ echo a > a | |
6 $ hg add a | |
7 $ hg ci -m 'a' | |
8 $ echo b > a | |
9 $ hg ci -m'b' | |
10 $ hg up 0 | |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 $ hg book main | |
13 $ hg book | |
14 * main 0:cb9a9f314b8b | |
15 $ echo c > c | |
16 $ hg add c | |
17 $ hg ci -m'c' | |
18 created new head | |
19 $ hg book | |
20 * main 2:d36c0562f908 | |
21 $ hg heads | |
22 changeset: 2:d36c0562f908 | |
23 bookmark: main | |
24 tag: tip | |
25 parent: 0:cb9a9f314b8b | |
26 user: test | |
27 date: Thu Jan 01 00:00:00 1970 +0000 | |
28 summary: c | |
29 | |
30 changeset: 1:1e6c11564562 | |
31 user: test | |
32 date: Thu Jan 01 00:00:00 1970 +0000 | |
33 summary: b | |
34 | |
35 $ hg up 1e6c11564562 | |
36 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
37 $ hg merge main | |
38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
39 (branch merge, don't forget to commit) | |
40 $ hg book | |
41 main 2:d36c0562f908 | |
42 $ hg ci -m'merge' | |
43 $ hg book | |
44 main 2:d36c0562f908 | |
45 |