Mercurial > evolve
comparison tests/test-stabilize-result.t @ 3590:d5adce52cef4 mercurial-4.4
test-compat: merge stable into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 21 Mar 2018 16:06:17 +0100 |
| parents | fe16284cd95a |
| children | 98941c28f3e2 19ec729f3ca2 |
comparison
equal
deleted
inserted
replaced
| 3589:e4ac2e2c2086 | 3590:d5adce52cef4 |
|---|---|
| 216 o 0:07f494440405@default(public) bk:[] adda | 216 o 0:07f494440405@default(public) bk:[] adda |
| 217 | 217 |
| 218 $ echo 'babar' >> a | 218 $ echo 'babar' >> a |
| 219 $ hg amend | 219 $ hg amend |
| 220 $ hg up --hidden 3932c176bbaa | 220 $ hg up --hidden 3932c176bbaa |
| 221 updating to a hidden changeset 3932c176bbaa | |
| 222 (hidden revision '3932c176bbaa' was rewritten as: d2f173e25686) | |
| 223 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 221 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 224 working directory parent is obsolete! (3932c176bbaa) | 222 working directory parent is obsolete! (3932c176bbaa) |
| 225 (use 'hg evolve' to update to its successor: d2f173e25686) | 223 (use 'hg evolve' to update to its successor: d2f173e25686) |
| 226 $ mv a a.old | 224 $ mv a a.old |
| 227 $ echo 'jungle' > a | 225 $ echo 'jungle' > a |
| 230 $ hg amend | 228 $ hg amend |
| 231 2 new content-divergent changesets | 229 2 new content-divergent changesets |
| 232 $ glog | 230 $ glog |
| 233 @ 14:eacc9c8240fe@default(draft) bk:[] More addition | 231 @ 14:eacc9c8240fe@default(draft) bk:[] More addition |
| 234 | | 232 | |
| 235 | * 13:d2f173e25686@default(draft) bk:[] More addition | 233 | o 13:d2f173e25686@default(draft) bk:[] More addition |
| 236 |/ | 234 |/ |
| 237 | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: | 235 | o 11:3d968e0b3097@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: |
| 238 | | | 236 | | |
| 239 o | 7:7bc2f5967f5e@default(draft) bk:[] add c | 237 o | 7:7bc2f5967f5e@default(draft) bk:[] add c |
| 240 | | | 238 | | |
| 326 | 324 |
| 327 Check conflict during divergence resolution | 325 Check conflict during divergence resolution |
| 328 ------------------------------------------------- | 326 ------------------------------------------------- |
| 329 | 327 |
| 330 $ hg up --hidden 3932c176bbaa | 328 $ hg up --hidden 3932c176bbaa |
| 331 updating to a hidden changeset 3932c176bbaa | |
| 332 (hidden revision '3932c176bbaa' was rewritten as: f344982e63c4) | |
| 333 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 329 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 334 working directory parent is obsolete! (3932c176bbaa) | 330 working directory parent is obsolete! (3932c176bbaa) |
| 335 (use 'hg evolve' to update to its successor: f344982e63c4) | 331 (use 'hg evolve' to update to its successor: f344982e63c4) |
| 336 $ echo 'gotta break' >> a | 332 $ echo 'gotta break' >> a |
| 337 $ hg amend | 333 $ hg amend |