1 % test fetch with default branches only |
|
2 adding a |
|
3 updating to branch default |
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
5 updating to branch default |
|
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7 adding b |
|
8 1:97d72e5f12c7 |
|
9 % should pull one change |
|
10 pulling from ../a |
|
11 searching for changes |
|
12 adding changesets |
|
13 adding manifests |
|
14 adding file changes |
|
15 added 1 changesets with 1 changes to 1 files |
|
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
17 1:97d72e5f12c7 |
|
18 adding c |
|
19 updating to branch default |
|
20 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
21 updating to branch default |
|
22 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
23 % should merge c into a |
|
24 pulling from ../a |
|
25 searching for changes |
|
26 adding changesets |
|
27 adding manifests |
|
28 adding file changes |
|
29 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
30 updating to 2:97d72e5f12c7 |
|
31 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
32 merging with 1:5e056962225c |
|
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
34 new changeset 3:cd3a41621cf0 merges remote changes with local |
|
35 a |
|
36 b |
|
37 c |
|
38 % fetch over http, no auth |
|
39 pulling from http://localhost:$HGPORT/ |
|
40 searching for changes |
|
41 adding changesets |
|
42 adding manifests |
|
43 adding file changes |
|
44 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
45 updating to 2:97d72e5f12c7 |
|
46 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
47 merging with 1:5e056962225c |
|
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
49 new changeset 3:... merges remote changes with local |
|
50 Automated merge with http://localhost:$HGPORT/ |
|
51 % fetch over http with auth (should be hidden in desc) |
|
52 pulling from http://user:***@localhost:$HGPORT/ |
|
53 searching for changes |
|
54 adding changesets |
|
55 adding manifests |
|
56 adding file changes |
|
57 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
58 updating to 2:97d72e5f12c7 |
|
59 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
60 merging with 1:5e056962225c |
|
61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
62 new changeset 3:... merges remote changes with local |
|
63 Automated merge with http://localhost:$HGPORT/ |
|
64 updating to branch default |
|
65 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
66 updating to branch default |
|
67 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
68 adding f |
|
69 adding g |
|
70 % should merge f into g |
|
71 pulling from ../f |
|
72 searching for changes |
|
73 adding changesets |
|
74 adding manifests |
|
75 adding file changes |
|
76 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
77 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
78 merging with 3:cc6a3744834d |
|
79 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
80 new changeset 4:55aa4f32ec59 merges remote changes with local |
|
81 % should abort, because i is modified |
|
82 abort: working directory is missing some files |
|
83 % test fetch with named branches |
|
84 adding a |
|
85 marked working directory as branch a |
|
86 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
87 marked working directory as branch b |
|
88 adding b |
|
89 |
|
90 % pull in change on foreign branch |
|
91 updating to branch default |
|
92 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
93 updating to branch default |
|
94 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
95 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
96 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 pulling from n1 |
|
98 searching for changes |
|
99 adding changesets |
|
100 adding manifests |
|
101 adding file changes |
|
102 added 1 changesets with 1 changes to 1 files |
|
103 % parent should be 2 (no automatic update) |
|
104 2 |
|
105 |
|
106 % pull in changes on both foreign and local branches |
|
107 updating to branch default |
|
108 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 updating to branch default |
|
110 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
112 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
113 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
114 pulling from n1 |
|
115 searching for changes |
|
116 adding changesets |
|
117 adding manifests |
|
118 adding file changes |
|
119 added 2 changesets with 2 changes to 2 files |
|
120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
121 % parent should be 4 (fast forward) |
|
122 4 |
|
123 |
|
124 % pull changes on foreign (2 new heads) and local (1 new head) branches |
|
125 % with a local change |
|
126 updating to branch default |
|
127 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
128 updating to branch default |
|
129 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
130 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
131 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
132 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
133 created new head |
|
134 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
135 adding c |
|
136 pulling from n1 |
|
137 searching for changes |
|
138 adding changesets |
|
139 adding manifests |
|
140 adding file changes |
|
141 added 3 changesets with 3 changes to 2 files (+2 heads) |
|
142 updating to 5:708c6cce3d26 |
|
143 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
144 merging with 3:d83427717b1f |
|
145 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
146 new changeset 7:48f1a33f52af merges remote changes with local |
|
147 % parent should be 7 (new merge changeset) |
|
148 7 |
|
149 % pull in changes on foreign (merge of local branch) and local (2 new |
|
150 % heads) with a local change |
|
151 updating to branch default |
|
152 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
153 updating to branch default |
|
154 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
156 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
157 (branch merge, don't forget to commit) |
|
158 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
159 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
160 created new head |
|
161 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
162 pulling from n1 |
|
163 searching for changes |
|
164 adding changesets |
|
165 adding manifests |
|
166 adding file changes |
|
167 added 3 changesets with 2 changes to 1 files (+2 heads) |
|
168 not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them) |
|
169 % parent should be 3 (fetch did not merge anything) |
|
170 3 |
|
171 % pull in change on different branch than dirstate |
|
172 adding a |
|
173 updating to branch default |
|
174 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
175 marked working directory as branch topic |
|
176 abort: working dir not at branch tip (use "hg update" to check out branch tip) |
|
177 % parent should be 0 (fetch did not update or merge anything) |
|
178 0 |
|
179 % test fetch with inactive branches |
|
180 adding a |
|
181 marked working directory as branch second |
|
182 adding b |
|
183 marked working directory as branch default |
|
184 adding c |
|
185 created new head |
|
186 updating to branch default |
|
187 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
188 % fetch should succeed |
|
189 pulling from ../ib1 |
|
190 searching for changes |
|
191 no changes found |
|
192 % test issue1726 |
|
193 adding a |
|
194 updating to branch default |
|
195 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
196 pulling from ../i1726r1 |
|
197 searching for changes |
|
198 adding changesets |
|
199 adding manifests |
|
200 adding file changes |
|
201 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
202 updating to 2:7837755a2789 |
|
203 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
204 merging with 1:d1f0c6c48ebd |
|
205 merging a |
|
206 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
207 new changeset 3 merges remote changes with local |
|
208 3 |
|
209 |
|
210 % test issue2047 |
|
211 pulling from ../i2047a |
|
212 searching for changes |
|
213 adding changesets |
|
214 adding manifests |
|
215 adding file changes |
|
216 added 1 changesets with 1 changes to 1 files |
|