equal
deleted
inserted
replaced
37 | |
37 | |
38 o 0 () c_alpha |
38 o 0 () c_alpha |
39 |
39 |
40 $ hg log -r 'ngtip(.)' |
40 $ hg log -r 'ngtip(.)' |
41 3 () c_delta |
41 3 () c_delta |
|
42 $ hg log -r 'default' |
|
43 3 () c_delta |
42 |
44 |
43 |
45 |
44 multiple heads with topic |
46 multiple heads with topic |
45 |
47 |
46 $ hg up "desc('c_beta')" |
48 $ hg up "desc('c_beta')" |
62 | |
64 | |
63 o 0 () c_alpha |
65 o 0 () c_alpha |
64 |
66 |
65 $ hg log -r 'ngtip(.)' |
67 $ hg log -r 'ngtip(.)' |
66 3 () c_delta |
68 3 () c_delta |
|
69 $ hg log -r 'default' |
|
70 3 () c_delta |
67 |
71 |
68 one of the head is a valid tip |
72 one of the head is a valid tip |
69 |
73 |
70 $ hg up "desc('c_delta')" |
74 $ hg up "desc('c_delta')" |
71 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
75 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
72 $ echo epsilon >> epsilon |
76 $ echo epsilon >> epsilon |
73 $ hg add epsilon |
77 $ hg add epsilon |
74 $ hg ci -m "c_epsilon" |
78 $ hg ci -m "c_epsilon" |
75 created new head |
|
76 $ hg log -G |
79 $ hg log -G |
77 @ 6 () c_epsilon |
80 @ 6 () c_epsilon |
78 | |
81 | |
79 | o 5 (monkey) zephir |
82 | o 5 (monkey) zephir |
80 | | |
83 | | |
88 | |
91 | |
89 o 0 () c_alpha |
92 o 0 () c_alpha |
90 |
93 |
91 $ hg log -r 'ngtip(.)' |
94 $ hg log -r 'ngtip(.)' |
92 6 () c_epsilon |
95 6 () c_epsilon |
|
96 $ hg log -r 'default' |
|
97 6 () c_epsilon |
93 |
98 |
94 merge destination |
99 merge destination |
95 ================= |
100 ================= |
96 |
101 |
97 $ hg up 'ngtip(default)' |
102 $ hg up 'ngtip(default)' |
|
103 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
104 $ hg up default |
98 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
105 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
99 $ echo zeta >> zeta |
106 $ echo zeta >> zeta |
100 $ hg add zeta |
107 $ hg add zeta |
101 $ hg ci -m "c_zeta" |
108 $ hg ci -m "c_zeta" |
102 $ hg log -G |
109 $ hg log -G |