Mercurial > hg-stable
comparison tests/test-fetch.t @ 24368:55fd99a23fdc
fetch: use an abort hint where appropriate
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Tue, 17 Mar 2015 20:36:33 +0900 |
| parents | f1eaf03dd608 |
| children | 701df761aa94 |
comparison
equal
deleted
inserted
replaced
| 24367:aba1916c1b23 | 24368:55fd99a23fdc |
|---|---|
| 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 directory not at branch tip (use "hg update" to check out branch tip) | 342 abort: working directory not at branch tip |
| 343 (use "hg update" to check out branch tip) | |
| 343 [255] | 344 [255] |
| 344 | 345 |
| 345 parent should be 0 (fetch did not update or merge anything) | 346 parent should be 0 (fetch did not update or merge anything) |
| 346 | 347 |
| 347 $ hg -R n2 parents --template '{rev}\n' | 348 $ hg -R n2 parents --template '{rev}\n' |