Mercurial > hg
comparison tests/test-issue1502.t @ 19937:1596f2d8f242 stable 2.8-rc
merge default into stable for 2.8 freeze
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 20 Oct 2013 16:43:11 -0700 |
| parents | 76df01e56e7f |
| children | 2fc86d92c4a9 |
comparison
equal
deleted
inserted
replaced
| 19914:f91e932b2cfe | 19937:1596f2d8f242 |
|---|---|
| 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 |