Mercurial > evolve

comparison tests/test-evolve-phase-divergence.t @ 5244:4da1d21231ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update output to match 1b8fd4af3318 in core CORE-TEST-OUTPUT-UPDATE: 1b8fd4af3318
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 15 Apr 2020 21:52:29 +0800
parents 900668a93629
children 417503ef667d
comparison
equal deleted inserted replaced
5243:5cfec61b872b 5244:4da1d21231ae
343 the commit message 343 the commit message
344 344
345 $ hg glog 345 $ hg glog
346 @ 5:3d62500c673d phase-divergent update to aa071e5554e3: 346 @ 5:3d62500c673d phase-divergent update to aa071e5554e3:
347 | (bm) draft 347 | (bm) draft
348 o 3:aa071e5554e3 added foo to foo 348 % 3:aa071e5554e3 added foo to foo
349 | () public 349 | () public
350 o 1:4d1169d82e47 modify a 350 o 1:4d1169d82e47 modify a
351 | () public 351 | () public
352 o 0:d3873e73d99e init 352 o 0:d3873e73d99e init
353 () public 353 () public
354 354
355 $ hg obslog -r . --all 355 $ hg obslog -r . --all
356 @ 3d62500c673d (5) phase-divergent update to aa071e5554e3: 356 @ 3d62500c673d (5) phase-divergent update to aa071e5554e3:
357 | 357 |
358 x d47f2b37ed82 (4) added bar to foo 358 % d47f2b37ed82 (4) added bar to foo
359 | rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 359 | rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
360 | 360 |
361 o aa071e5554e3 (3) added foo to foo 361 % aa071e5554e3 (3) added foo to foo
362 rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 362 rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
363 363
364 364
365 Syncing all other repositories 365 Syncing all other repositories
366 ------------------------------ 366 ------------------------------
493 +foo 493 +foo
494 494
495 $ hg glog 495 $ hg glog
496 @ 8:502e73736632 phase-divergent update to b756eb10ea73: 496 @ 8:502e73736632 phase-divergent update to b756eb10ea73:
497 | (bm) draft 497 | (bm) draft
498 o 6:b756eb10ea73 added bar to bar 498 % 6:b756eb10ea73 added bar to bar
499 | () public 499 | () public
500 o 5:3d62500c673d phase-divergent update to aa071e5554e3: 500 o 5:3d62500c673d phase-divergent update to aa071e5554e3:
501 | () public 501 | () public
502 o 3:aa071e5554e3 added foo to foo 502 o 3:aa071e5554e3 added foo to foo
503 | () public 503 | () public
751 +foo 751 +foo
752 752
753 $ hg glog 753 $ hg glog
754 @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: 754 @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
755 | () draft 755 | () draft
756 o 12:dc88f5aa9bc9 y to y and foobar to foo 756 % 12:dc88f5aa9bc9 y to y and foobar to foo
757 | () public 757 | () public
758 o 9:2352021b3785 added x to x 758 o 9:2352021b3785 added x to x
759 | (bm) public 759 | (bm) public
760 o 8:502e73736632 phase-divergent update to b756eb10ea73: 760 o 8:502e73736632 phase-divergent update to b756eb10ea73:
761 | () public 761 | () public
839 working directory is now at e3090241a10c 839 working directory is now at e3090241a10c
840 840
841 $ hg glog 841 $ hg glog
842 @ 21:e3090241a10c phase-divergent update to f3794e5a91dc: 842 @ 21:e3090241a10c phase-divergent update to f3794e5a91dc:
843 | () draft 843 | () draft
844 o 17:f3794e5a91dc added l to l 844 % 17:f3794e5a91dc added l to l
845 | () public 845 | () public
846 o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: 846 o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
847 | () public 847 | () public
848 o 12:dc88f5aa9bc9 y to y and foobar to foo 848 o 12:dc88f5aa9bc9 y to y and foobar to foo
849 | () public 849 | () public
1265 working directory is now at 88b0dae5369a 1265 working directory is now at 88b0dae5369a
1266 1266
1267 $ hg glog --hidden 1267 $ hg glog --hidden
1268 @ 7:88b0dae5369a phase-divergent update to a51bce62c219: 1268 @ 7:88b0dae5369a phase-divergent update to a51bce62c219:
1269 | () draft 1269 | () draft
1270 | x 6:98dad8812511 added n 1270 | % 6:98dad8812511 added n
1271 | | () draft 1271 | | () draft
1272 +---o 5:86419909e017 phase-divergent update to a51bce62c219: 1272 +---o 5:86419909e017 phase-divergent update to a51bce62c219:
1273 | | () draft 1273 | | () draft
1274 | | x 4:52ca78bb98c7 added n 1274 | | x 4:52ca78bb98c7 added n
1275 | | | () draft 1275 | | | () draft
1276 | | | x 3:e1154ec0206a added n 1276 | | | x 3:e1154ec0206a added n
1277 | | |/ () draft 1277 | | |/ () draft
1278 | | x 2:4f25cd9cd2bf added m 1278 | | x 2:4f25cd9cd2bf added m
1279 | |/ () draft 1279 | |/ () draft
1280 o | 1:a51bce62c219 added m and n 1280 % | 1:a51bce62c219 added m and n
1281 |/ () public 1281 |/ () public
1282 o 0:d3873e73d99e init 1282 o 0:d3873e73d99e init
1283 () public 1283 () public
1284 1284
1285 $ hg obslog -r a51bce62c219 --all 1285 $ hg obslog -r a51bce62c219 --all
1288 | @ 88b0dae5369a (7) phase-divergent update to a51bce62c219: 1288 | @ 88b0dae5369a (7) phase-divergent update to a51bce62c219:
1289 | | 1289 | |
1290 x | 4f25cd9cd2bf (2) added m 1290 x | 4f25cd9cd2bf (2) added m
1291 | | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1291 | | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1292 | | 1292 | |
1293 | x 98dad8812511 (6) added n 1293 | % 98dad8812511 (6) added n
1294 | | rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1294 | | rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1295 | | 1295 | |
1296 | x 52ca78bb98c7 (4) added n 1296 | x 52ca78bb98c7 (4) added n
1297 | | rebased(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1297 | | rebased(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1298 | | 1298 | |
1299 | x e1154ec0206a (3) added n 1299 | x e1154ec0206a (3) added n
1300 |/ amended(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1300 |/ amended(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1301 | 1301 |
1302 o a51bce62c219 (1) added m and n 1302 % a51bce62c219 (1) added m and n
1303 split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000) 1303 split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1304 1304
1305 1305
1306 XXX: not sure this is correct 1306 XXX: not sure this is correct
1307 $ hg exp 86419909e017 1307 $ hg exp 86419909e017
1728 | +ii 1728 | +ii
1729 | III 1729 | III
1730 | IV 1730 | IV
1731 | V 1731 | V
1732 | 1732 |
1733 o changeset: 1:3074c7249d20 1733 % changeset: 1:3074c7249d20
1734 | user: test 1734 | user: test
1735 ~ date: Thu Jan 01 00:00:00 1970 +0000 1735 ~ date: Thu Jan 01 00:00:00 1970 +0000
1736 summary: E1 1736 summary: E1
1737 1737
1738 diff -r 6d1fdf6de7e2 -r 3074c7249d20 letters 1738 diff -r 6d1fdf6de7e2 -r 3074c7249d20 letters
1764 +nine 1764 +nine
1765 1765
1766 $ hg obslog --patch 1766 $ hg obslog --patch
1767 @ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20: 1767 @ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20:
1768 | 1768 |
1769 x 599454370881 (2) E2 1769 % 599454370881 (2) E2
1770 | rewritten(description, parent, content) as 9eebcb77a7e2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1770 | rewritten(description, parent, content) as 9eebcb77a7e2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1771 | (No patch available, changesets rebased) 1771 | (No patch available, changesets rebased)
1772 | 1772 |
1773 o 3074c7249d20 (1) E1 1773 % 3074c7249d20 (1) E1
1774 rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1774 rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1775 diff -r 3074c7249d20 -r 599454370881 changeset-description 1775 diff -r 3074c7249d20 -r 599454370881 changeset-description
1776 --- a/changeset-description 1776 --- a/changeset-description
1777 +++ b/changeset-description 1777 +++ b/changeset-description
1778 @@ -1,1 +1,1 @@ 1778 @@ -1,1 +1,1 @@