Mercurial > hg
comparison tests/test-issue1502.t @ 19798:76df01e56e7f
update: improve error message for clean non-linear update
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 23 Sep 2013 17:43:33 -0700 |
| parents | 9910f60a37ee |
| children | 2fc86d92c4a9 |
comparison
equal
deleted
inserted
replaced
| 19797:a9abdb168425 | 19798:76df01e56e7f |
|---|---|
| 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: crosses branches (merge branches or update --check to force update) | 22 not updating: not a linear update |
| 23 (merge or update --check to force update) | |
| 23 | 24 |
| 24 $ hg -R foo1 book branchy | 25 $ hg -R foo1 book branchy |
| 25 $ hg -R foo1 book | 26 $ hg -R foo1 book |
| 26 * branchy 1:e3e522925eff | 27 * branchy 1:e3e522925eff |
| 27 | 28 |