|
1 # |
|
2 # A B |
|
3 # |
|
4 # 3 4 3 |
|
5 # |\/| |\ |
|
6 # |/\| | \ |
|
7 # 1 2 1 2 |
|
8 # \ / \ / |
|
9 # 0 0 |
|
10 # |
|
11 # if the result of the merge of 1 and 2 |
|
12 # is the same in 3 and 4, no new manifest |
|
13 # will be created and the manifest group |
|
14 # will be empty during the pull |
|
15 # |
|
16 # (plus we test a failure where outgoing |
|
17 # wrongly reported the number of csets) |
|
18 # |
|
19 |
|
20 $ hg init a |
|
21 $ cd a |
|
22 $ touch init |
|
23 $ hg ci -A -m 0 |
|
24 adding init |
|
25 $ touch x y |
|
26 $ hg ci -A -m 1 |
|
27 adding x |
|
28 adding y |
|
29 |
|
30 $ hg update 0 |
|
31 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
32 $ touch x y |
|
33 $ hg ci -A -m 2 |
|
34 adding x |
|
35 adding y |
|
36 created new head |
|
37 |
|
38 $ hg merge 1 |
|
39 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
40 (branch merge, don't forget to commit) |
|
41 $ hg ci -A -m m1 |
|
42 |
|
43 #hg log |
|
44 #hg debugindex .hg/store/00manifest.i |
|
45 |
|
46 $ hg update -C 1 |
|
47 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
48 $ hg merge 2 |
|
49 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
50 (branch merge, don't forget to commit) |
|
51 $ hg ci -A -m m2 |
|
52 created new head |
|
53 |
|
54 #hg log |
|
55 #hg debugindex .hg/store/00manifest.i |
|
56 |
|
57 $ cd .. |
|
58 |
|
59 $ hg clone -r 3 a b |
|
60 requesting all changes |
|
61 adding changesets |
|
62 adding manifests |
|
63 adding file changes |
|
64 added 4 changesets with 3 changes to 3 files |
|
65 updating to branch default |
|
66 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
67 |
|
68 $ hg clone -r 4 a c |
|
69 requesting all changes |
|
70 adding changesets |
|
71 adding manifests |
|
72 adding file changes |
|
73 added 4 changesets with 3 changes to 3 files |
|
74 updating to branch default |
|
75 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
76 |
|
77 $ hg -R a outgoing b |
|
78 comparing with b |
|
79 searching for changes |
|
80 changeset: 4:119caaef4ed1 |
|
81 tag: tip |
|
82 parent: 1:79f9e10cd04e |
|
83 parent: 2:8e1bb01c1a24 |
|
84 user: test |
|
85 date: Thu Jan 01 00:00:00 1970 +0000 |
|
86 summary: m2 |
|
87 |
|
88 $ hg -R a outgoing c |
|
89 comparing with c |
|
90 searching for changes |
|
91 changeset: 3:cbb48b367d1b |
|
92 parent: 2:8e1bb01c1a24 |
|
93 parent: 1:79f9e10cd04e |
|
94 user: test |
|
95 date: Thu Jan 01 00:00:00 1970 +0000 |
|
96 summary: m1 |
|
97 |
|
98 $ hg -R b outgoing c |
|
99 comparing with c |
|
100 searching for changes |
|
101 changeset: 3:cbb48b367d1b |
|
102 tag: tip |
|
103 parent: 2:8e1bb01c1a24 |
|
104 parent: 1:79f9e10cd04e |
|
105 user: test |
|
106 date: Thu Jan 01 00:00:00 1970 +0000 |
|
107 summary: m1 |
|
108 |
|
109 $ hg -R c outgoing b |
|
110 comparing with b |
|
111 searching for changes |
|
112 changeset: 3:119caaef4ed1 |
|
113 tag: tip |
|
114 parent: 1:79f9e10cd04e |
|
115 parent: 2:8e1bb01c1a24 |
|
116 user: test |
|
117 date: Thu Jan 01 00:00:00 1970 +0000 |
|
118 summary: m2 |
|
119 |
|
120 |
|
121 $ hg -R b pull a |
|
122 pulling from a |
|
123 searching for changes |
|
124 adding changesets |
|
125 adding manifests |
|
126 adding file changes |
|
127 added 1 changesets with 0 changes to 0 files (+1 heads) |
|
128 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
129 |
|
130 $ hg -R c pull a |
|
131 pulling from a |
|
132 searching for changes |
|
133 adding changesets |
|
134 adding manifests |
|
135 adding file changes |
|
136 added 1 changesets with 0 changes to 0 files (+1 heads) |
|
137 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
138 |