equal
deleted
inserted
replaced
337 $ hg -R n1 ci -m next |
337 $ hg -R n1 ci -m next |
338 $ hg -R n2 branch topic |
338 $ hg -R n2 branch topic |
339 marked working directory as branch topic |
339 marked working directory as branch topic |
340 (branches are permanent and global, did you want a bookmark?) |
340 (branches are permanent and global, did you want a bookmark?) |
341 $ hg -R n2 fetch -m merge n1 |
341 $ hg -R n2 fetch -m merge n1 |
342 abort: working dir not at branch tip (use "hg update" to check out branch tip) |
342 abort: working directory not at branch tip (use "hg update" to check out branch tip) |
343 [255] |
343 [255] |
344 |
344 |
345 parent should be 0 (fetch did not update or merge anything) |
345 parent should be 0 (fetch did not update or merge anything) |
346 |
346 |
347 $ hg -R n2 parents --template '{rev}\n' |
347 $ hg -R n2 parents --template '{rev}\n' |