equal
deleted
inserted
replaced
142 $ echo base > nbase/a |
142 $ echo base > nbase/a |
143 $ hg -R nbase ci -Am base |
143 $ hg -R nbase ci -Am base |
144 adding a |
144 adding a |
145 $ hg -R nbase branch a |
145 $ hg -R nbase branch a |
146 marked working directory as branch a |
146 marked working directory as branch a |
|
147 (branches are permanent and global, did you want a bookmark?) |
147 $ echo a > nbase/a |
148 $ echo a > nbase/a |
148 $ hg -R nbase ci -m a |
149 $ hg -R nbase ci -m a |
149 $ hg -R nbase up -C 0 |
150 $ hg -R nbase up -C 0 |
150 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
151 $ hg -R nbase branch b |
152 $ hg -R nbase branch b |
152 marked working directory as branch b |
153 marked working directory as branch b |
|
154 (branches are permanent and global, did you want a bookmark?) |
153 $ echo b > nbase/b |
155 $ echo b > nbase/b |
154 $ hg -R nbase ci -Am b |
156 $ hg -R nbase ci -Am b |
155 adding b |
157 adding b |
156 |
158 |
157 pull in change on foreign branch |
159 pull in change on foreign branch |
316 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
318 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
317 $ echo b > n1/a |
319 $ echo b > n1/a |
318 $ hg -R n1 ci -m next |
320 $ hg -R n1 ci -m next |
319 $ hg -R n2 branch topic |
321 $ hg -R n2 branch topic |
320 marked working directory as branch topic |
322 marked working directory as branch topic |
|
323 (branches are permanent and global, did you want a bookmark?) |
321 $ hg -R n2 fetch -m merge n1 |
324 $ hg -R n2 fetch -m merge n1 |
322 abort: working dir not at branch tip (use "hg update" to check out branch tip) |
325 abort: working dir not at branch tip (use "hg update" to check out branch tip) |
323 [255] |
326 [255] |
324 |
327 |
325 parent should be 0 (fetch did not update or merge anything) |
328 parent should be 0 (fetch did not update or merge anything) |
334 $ echo a > ib1/a |
337 $ echo a > ib1/a |
335 $ hg --cwd ib1 ci -Am base |
338 $ hg --cwd ib1 ci -Am base |
336 adding a |
339 adding a |
337 $ hg --cwd ib1 branch second |
340 $ hg --cwd ib1 branch second |
338 marked working directory as branch second |
341 marked working directory as branch second |
|
342 (branches are permanent and global, did you want a bookmark?) |
339 $ echo b > ib1/b |
343 $ echo b > ib1/b |
340 $ hg --cwd ib1 ci -Am onsecond |
344 $ hg --cwd ib1 ci -Am onsecond |
341 adding b |
345 adding b |
342 $ hg --cwd ib1 branch -f default |
346 $ hg --cwd ib1 branch -f default |
343 marked working directory as branch default |
347 marked working directory as branch default |
|
348 (branches are permanent and global, did you want a bookmark?) |
344 $ echo c > ib1/c |
349 $ echo c > ib1/c |
345 $ hg --cwd ib1 ci -Am newdefault |
350 $ hg --cwd ib1 ci -Am newdefault |
346 adding c |
351 adding c |
347 created new head |
352 created new head |
348 $ hg clone ib1 ib2 |
353 $ hg clone ib1 ib2 |