Mercurial > evolve
comparison tests/test-issue-6028.t @ 4576:96ce1030d2fb
tests: add --update to hg evolve to reduce test changes for the next patch
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 14 Apr 2019 02:18:19 +0800 |
| parents | 699e25687cc5 |
| children | 75e76141cba2 |
comparison
equal
deleted
inserted
replaced
| 4575:903e8b983fac | 4576:96ce1030d2fb |
|---|---|
| 110 | 110 |
| 111 $ hg up 4 | 111 $ hg up 4 |
| 112 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 112 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 113 | 113 |
| 114 start the evolve | 114 start the evolve |
| 115 $ hg evolve | 115 $ hg evolve --update |
| 116 move:[8] merged aa | 116 move:[8] merged aa |
| 117 atop:[4] merged b | 117 atop:[4] merged b |
| 118 working directory is now at c920dd828523 | 118 working directory is now at c920dd828523 |
| 119 | 119 |
| 120 evolve creates an obsolete changeset above as 11 | 120 evolve creates an obsolete changeset above as 11 |