equal
deleted
inserted
replaced
153 $ hg -R nbase branch b |
153 $ hg -R nbase branch b |
154 marked working directory as branch b |
154 marked working directory as branch b |
155 $ echo b > nbase/b |
155 $ echo b > nbase/b |
156 $ hg -R nbase ci -Ad '3 0' -m b |
156 $ hg -R nbase ci -Ad '3 0' -m b |
157 adding b |
157 adding b |
158 $ echo |
|
159 |
|
160 |
158 |
161 pull in change on foreign branch |
159 pull in change on foreign branch |
162 |
160 |
163 $ hg clone nbase n1 |
161 $ hg clone nbase n1 |
164 updating to branch default |
162 updating to branch default |
183 parent should be 2 (no automatic update) |
181 parent should be 2 (no automatic update) |
184 |
182 |
185 $ hg -R n2 parents --template '{rev}\n' |
183 $ hg -R n2 parents --template '{rev}\n' |
186 2 |
184 2 |
187 $ rm -fr n1 n2 |
185 $ rm -fr n1 n2 |
188 $ echo |
|
189 |
|
190 |
186 |
191 pull in changes on both foreign and local branches |
187 pull in changes on both foreign and local branches |
192 |
188 |
193 $ hg clone nbase n1 |
189 $ hg clone nbase n1 |
194 updating to branch default |
190 updating to branch default |
218 parent should be 4 (fast forward) |
214 parent should be 4 (fast forward) |
219 |
215 |
220 $ hg -R n2 parents --template '{rev}\n' |
216 $ hg -R n2 parents --template '{rev}\n' |
221 4 |
217 4 |
222 $ rm -fr n1 n2 |
218 $ rm -fr n1 n2 |
223 $ echo |
|
224 |
|
225 |
219 |
226 pull changes on foreign (2 new heads) and local (1 new head) branches |
220 pull changes on foreign (2 new heads) and local (1 new head) branches |
227 with a local change |
221 with a local change |
228 |
222 |
229 $ hg clone nbase n1 |
223 $ hg clone nbase n1 |
391 merging a |
385 merging a |
392 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
386 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
393 new changeset 3:* merges remote changes with local (glob) |
387 new changeset 3:* merges remote changes with local (glob) |
394 $ hg --cwd i1726r2 heads default --template '{rev}\n' |
388 $ hg --cwd i1726r2 heads default --template '{rev}\n' |
395 3 |
389 3 |
396 $ echo |
|
397 |
|
398 |
390 |
399 test issue2047 |
391 test issue2047 |
400 |
392 |
401 $ hg -q init i2047a |
393 $ hg -q init i2047a |
402 $ cd i2047a |
394 $ cd i2047a |