Mercurial > hg
comparison tests/test-issue1502.t @ 26968:216cc65cf227
pull: return 255 value on update failure (issue4948) (BC)
Before this patch hg pull -u on UpdateAbort error returned
0 value to the system. This patch fixes this by reraising
UpdateAbort with updated error msg.
| author | liscju <piotr.listkiewicz@gmail.com> |
|---|---|
| date | Sun, 15 Nov 2015 22:58:28 +0100 |
| parents | 2fc86d92c4a9 |
| children | 9e0535da20a5 |
comparison
equal
deleted
inserted
replaced
| 26967:7a8e9a985c3b | 26968:216cc65cf227 |
|---|---|
| 17 searching for changes | 17 searching for changes |
| 18 adding changesets | 18 adding changesets |
| 19 adding manifests | 19 adding manifests |
| 20 adding file changes | 20 adding file changes |
| 21 added 1 changesets with 1 changes to 1 files (+1 heads) | 21 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 22 not updating: not a linear update | 22 abort: not updating: not a linear update |
| 23 (merge or update --check to force update) | 23 (merge or update --check to force update) |
| 24 [255] | |
| 24 | 25 |
| 25 $ hg -R foo1 book branchy | 26 $ hg -R foo1 book branchy |
| 26 $ hg -R foo1 book | 27 $ hg -R foo1 book |
| 27 * branchy 1:e3e522925eff | 28 * branchy 1:e3e522925eff |
| 28 | 29 |