Mercurial > evolve
comparison tests/test-uncommit.t @ 3154:406992d0d611
evolve: rename --contentdivergent flag to --content-divergent
This makes the whole things easier to read.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 26 Oct 2017 09:02:25 +0200 |
| parents | 945a0989e41b |
| children | e1a230cc4527 ae6fddf39933 |
comparison
equal
deleted
inserted
replaced
| 3153:544354cfc626 | 3154:406992d0d611 |
|---|---|
| 285 Test --all | 285 Test --all |
| 286 | 286 |
| 287 $ hg up -C 3 --hidden | 287 $ hg up -C 3 --hidden |
| 288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 288 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 289 working directory parent is obsolete! (5eb72dbe0cb4) | 289 working directory parent is obsolete! (5eb72dbe0cb4) |
| 290 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue) | 290 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
| 291 $ hg --config extensions.purge= purge | 291 $ hg --config extensions.purge= purge |
| 292 $ hg uncommit --all -X e | 292 $ hg uncommit --all -X e |
| 293 1 new content-divergent changesets | 293 1 new content-divergent changesets |
| 294 $ hg st --copies | 294 $ hg st --copies |
| 295 M b | 295 M b |