Mercurial > evolve
comparison tests/test-uncommit.t @ 4513:d70db7e455dc mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:42:13 +0200 |
| parents | f7afd3a158e3 79de4e86d9a4 |
| children | f54bb6eaf5e6 3ef4980353af |
comparison
equal
deleted
inserted
replaced
| 4512:7a779a288793 | 4513:d70db7e455dc |
|---|---|
| 236 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'} | 236 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'} |
| 237 | 237 |
| 238 Test phase is preserved, no local changes | 238 Test phase is preserved, no local changes |
| 239 | 239 |
| 240 $ hg up -C 3 --hidden | 240 $ hg up -C 3 --hidden |
| 241 updating to a hidden changeset 5eb72dbe0cb4 | |
| 242 (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) | |
| 241 8 files updated, 0 files merged, 1 files removed, 0 files unresolved | 243 8 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 242 (leaving bookmark touncommit-bm) | 244 (leaving bookmark touncommit-bm) |
| 243 updated to hidden changeset 5eb72dbe0cb4 | |
| 244 (hidden revision '5eb72dbe0cb4' was rewritten as: e8db4aa611f6) | |
| 245 working directory parent is obsolete! (5eb72dbe0cb4) | 245 working directory parent is obsolete! (5eb72dbe0cb4) |
| 246 (use 'hg evolve' to update to its successor: e8db4aa611f6) | 246 (use 'hg evolve' to update to its successor: e8db4aa611f6) |
| 247 $ hg --config extensions.purge= purge | 247 $ hg --config extensions.purge= purge |
| 248 $ hg uncommit -I 'set:added() and e' | 248 $ hg uncommit -I 'set:added() and e' |
| 249 2 new content-divergent changesets | 249 2 new content-divergent changesets |
| 285 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'} | 285 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'} |
| 286 | 286 |
| 287 Test --all | 287 Test --all |
| 288 | 288 |
| 289 $ hg up -C 3 --hidden | 289 $ hg up -C 3 --hidden |
| 290 updating to a hidden changeset 5eb72dbe0cb4 | |
| 291 (hidden revision '5eb72dbe0cb4' has diverged) | |
| 290 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 292 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 291 updated to hidden changeset 5eb72dbe0cb4 | |
| 292 (hidden revision '5eb72dbe0cb4' has diverged) | |
| 293 working directory parent is obsolete! (5eb72dbe0cb4) | 293 working directory parent is obsolete! (5eb72dbe0cb4) |
| 294 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) | 294 (5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue) |
| 295 $ hg --config extensions.purge= purge | 295 $ hg --config extensions.purge= purge |
| 296 $ hg uncommit --all -X e | 296 $ hg uncommit --all -X e |
| 297 1 new content-divergent changesets | 297 1 new content-divergent changesets |