Mercurial > evolve
comparison tests/test-uncommit.t @ 3716:e5ba6531503e mercurial-4.3
testcompat: update output for Mercurial 4.3
Lets of minor update + one major update to tests/test-evolve-phase-divergence.t
since all hashed chance (different instability name).
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 25 Apr 2018 01:58:45 +0100 |
| parents | 98941c28f3e2 |
| children | 537fd9a86c06 |
comparison
equal
deleted
inserted
replaced
| 3715:a77fb9669e99 | 3716:e5ba6531503e |
|---|---|
| 231 $ hg bookmarks | 231 $ hg bookmarks |
| 232 * touncommit-bm 4:e8db4aa611f6 | 232 * touncommit-bm 4:e8db4aa611f6 |
| 233 touncommit-bm-inactive 4:e8db4aa611f6 | 233 touncommit-bm-inactive 4:e8db4aa611f6 |
| 234 unrelated 2:f63b90038565 | 234 unrelated 2:f63b90038565 |
| 235 $ hg debugobsolete | 235 $ hg debugobsolete |
| 236 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 236 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', '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 8 files updated, 0 files merged, 1 files removed, 0 files unresolved | 241 8 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 277 | o 1:f15c744d48e8@default(draft) addmore | 277 | o 1:f15c744d48e8@default(draft) addmore |
| 278 | | 278 | |
| 279 o 0:07f494440405@default(draft) adda | 279 o 0:07f494440405@default(draft) adda |
| 280 | 280 |
| 281 $ hg debugobsolete | 281 $ hg debugobsolete |
| 282 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 282 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} |
| 283 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 283 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} |
| 284 | 284 |
| 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 |
| 311 R n | 311 R n |
| 312 $ hg st --copies --change . | 312 $ hg st --copies --change . |
| 313 A e | 313 A e |
| 314 | 314 |
| 315 $ hg debugobsolete | 315 $ hg debugobsolete |
| 316 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 316 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} |
| 317 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 317 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} |
| 318 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 318 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} |
| 319 | 319 |
| 320 Display a warning if nothing left | 320 Display a warning if nothing left |
| 321 | 321 |
| 322 $ hg uncommit e | 322 $ hg uncommit e |
| 323 new changeset is empty | 323 new changeset is empty |
| 324 (use 'hg prune .' to remove it) | 324 (use 'hg prune .' to remove it) |
| 325 $ hg debugobsolete | 325 $ hg debugobsolete |
| 326 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 326 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} |
| 327 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 327 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} |
| 328 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 328 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} |
| 329 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} | 329 c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'} |
| 330 | 330 |
| 331 Test instability warning | 331 Test instability warning |
| 332 | 332 |
| 333 $ hg ci -m touncommit | 333 $ hg ci -m touncommit |
| 334 $ echo unrelated > unrelated | 334 $ echo unrelated > unrelated |