Mercurial > evolve

comparison tests/test-evolve-phase-divergence.t @ 5539:452651e69848 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvecmd: don't set `branchmerge=True` while resolving phase divergence We are not going to create a merge commit, neither we are using two parents in any way. I am unable to see any reason why `branchmerge` should be passed as `True` here. Passing branchmerge as True leads to side effect of having merge related commit information stored in mergestate which leads us to having an active mergestate.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 17 Sep 2020 14:51:45 +0530
parents e8660b28bfee
children 011b53a9d03c c2fab88e6d60
comparison
equal deleted inserted replaced
5538:2f572645b6d5 5539:452651e69848
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 % 3:aa071e5554e3 added foo to foo 348 o 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
359 d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} 359 d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'}
360 $ hg obslog -r . --all 360 $ hg obslog -r . --all
361 @ 3d62500c673d (5) phase-divergent update to aa071e5554e3: 361 @ 3d62500c673d (5) phase-divergent update to aa071e5554e3:
362 | rewritten(description, parent, content) from d47f2b37ed82 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 362 | rewritten(description, parent, content) from d47f2b37ed82 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
363 | 363 |
364 % d47f2b37ed82 (4) added bar to foo 364 x d47f2b37ed82 (4) added bar to foo
365 | rewritten(description, content) from aa071e5554e3 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 365 | rewritten(description, content) from aa071e5554e3 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
366 | 366 |
367 % aa071e5554e3 (3) added foo to foo 367 o aa071e5554e3 (3) added foo to foo
368 368
369 369
370 Syncing all other repositories 370 Syncing all other repositories
371 ------------------------------ 371 ------------------------------
372 372
498 +foo 498 +foo
499 499
500 $ hg glog 500 $ hg glog
501 @ 8:502e73736632 phase-divergent update to b756eb10ea73: 501 @ 8:502e73736632 phase-divergent update to b756eb10ea73:
502 | (bm) draft 502 | (bm) draft
503 % 6:b756eb10ea73 added bar to bar 503 o 6:b756eb10ea73 added bar to bar
504 | () public 504 | () public
505 o 5:3d62500c673d phase-divergent update to aa071e5554e3: 505 o 5:3d62500c673d phase-divergent update to aa071e5554e3:
506 | () public 506 | () public
507 o 3:aa071e5554e3 added foo to foo 507 o 3:aa071e5554e3 added foo to foo
508 | () public 508 | () public
786 +foo 786 +foo
787 787
788 $ hg glog 788 $ hg glog
789 @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: 789 @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
790 | () draft 790 | () draft
791 % 12:dc88f5aa9bc9 y to y and foobar to foo 791 o 12:dc88f5aa9bc9 y to y and foobar to foo
792 | () public 792 | () public
793 o 9:2352021b3785 added x to x 793 o 9:2352021b3785 added x to x
794 | (bm) public 794 | (bm) public
795 o 8:502e73736632 phase-divergent update to b756eb10ea73: 795 o 8:502e73736632 phase-divergent update to b756eb10ea73:
796 | () public 796 | () public
890 working directory is now at e3090241a10c 890 working directory is now at e3090241a10c
891 891
892 $ hg glog 892 $ hg glog
893 @ 21:e3090241a10c phase-divergent update to f3794e5a91dc: 893 @ 21:e3090241a10c phase-divergent update to f3794e5a91dc:
894 | () draft 894 | () draft
895 % 17:f3794e5a91dc added l to l 895 o 17:f3794e5a91dc added l to l
896 | () public 896 | () public
897 o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9: 897 o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
898 | () public 898 | () public
899 o 12:dc88f5aa9bc9 y to y and foobar to foo 899 o 12:dc88f5aa9bc9 y to y and foobar to foo
900 | () public 900 | () public
1327 working directory is now at 88b0dae5369a 1327 working directory is now at 88b0dae5369a
1328 1328
1329 $ hg glog --hidden 1329 $ hg glog --hidden
1330 @ 7:88b0dae5369a phase-divergent update to a51bce62c219: 1330 @ 7:88b0dae5369a phase-divergent update to a51bce62c219:
1331 | () draft 1331 | () draft
1332 | % 6:98dad8812511 added n 1332 | x 6:98dad8812511 added n
1333 | | () draft 1333 | | () draft
1334 +---o 5:86419909e017 phase-divergent update to a51bce62c219: 1334 +---o 5:86419909e017 phase-divergent update to a51bce62c219:
1335 | | () draft 1335 | | () draft
1336 | | x 4:52ca78bb98c7 added n 1336 | | x 4:52ca78bb98c7 added n
1337 | | | () draft 1337 | | | () draft
1338 | | | x 3:e1154ec0206a added n 1338 | | | x 3:e1154ec0206a added n
1339 | | |/ () draft 1339 | | |/ () draft
1340 | | x 2:4f25cd9cd2bf added m 1340 | | x 2:4f25cd9cd2bf added m
1341 | |/ () draft 1341 | |/ () draft
1342 % | 1:a51bce62c219 added m and n 1342 o | 1:a51bce62c219 added m and n
1343 |/ () public 1343 |/ () public
1344 o 0:d3873e73d99e init 1344 o 0:d3873e73d99e init
1345 () public 1345 () public
1346 1346
1347 $ hg debugobsolete 1347 $ hg debugobsolete
1358 | | rewritten(description, parent, content) from 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1358 | | rewritten(description, parent, content) from 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1359 | | 1359 | |
1360 x | 4f25cd9cd2bf (2) added m 1360 x | 4f25cd9cd2bf (2) added m
1361 | | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000) 1361 | | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1362 | | 1362 | |
1363 | % 98dad8812511 (6) added n 1363 | x 98dad8812511 (6) added n
1364 | | rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1364 | | rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1365 | | 1365 | |
1366 | x 52ca78bb98c7 (4) added n 1366 | x 52ca78bb98c7 (4) added n
1367 | | amended(content) from e1154ec0206a using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1367 | | amended(content) from e1154ec0206a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1368 | | 1368 | |
1369 | x e1154ec0206a (3) added n 1369 | x e1154ec0206a (3) added n
1370 |/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000) 1370 |/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
1371 | 1371 |
1372 % a51bce62c219 (1) added m and n 1372 o a51bce62c219 (1) added m and n
1373 1373
1374 1374
1375 XXX: not sure this is correct 1375 XXX: not sure this is correct
1376 $ hg exp 86419909e017 1376 $ hg exp 86419909e017
1377 # HG changeset patch 1377 # HG changeset patch
1799 | +ii 1799 | +ii
1800 | III 1800 | III
1801 | IV 1801 | IV
1802 | V 1802 | V
1803 | 1803 |
1804 % changeset: 1:3074c7249d20 1804 o changeset: 1:3074c7249d20
1805 | user: test 1805 | user: test
1806 ~ date: Thu Jan 01 00:00:00 1970 +0000 1806 ~ date: Thu Jan 01 00:00:00 1970 +0000
1807 summary: E1 1807 summary: E1
1808 1808
1809 diff -r 6d1fdf6de7e2 -r 3074c7249d20 letters 1809 diff -r 6d1fdf6de7e2 -r 3074c7249d20 letters
1840 $ hg obslog --patch 1840 $ hg obslog --patch
1841 @ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20: 1841 @ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20:
1842 | rewritten(description, parent, content) from 599454370881 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 1842 | rewritten(description, parent, content) from 599454370881 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1843 | (No patch available, changesets rebased) 1843 | (No patch available, changesets rebased)
1844 | 1844 |
1845 % 599454370881 (2) E2 1845 x 599454370881 (2) E2
1846 | rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000) 1846 | rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1847 | diff -r 3074c7249d20 -r 599454370881 changeset-description 1847 | diff -r 3074c7249d20 -r 599454370881 changeset-description
1848 | --- a/changeset-description 1848 | --- a/changeset-description
1849 | +++ b/changeset-description 1849 | +++ b/changeset-description
1850 | @@ -1,1 +1,1 @@ 1850 | @@ -1,1 +1,1 @@
1888 | III 1888 | III
1889 | IV 1889 | IV
1890 | V 1890 | V
1891 | 1891 |
1892 | 1892 |
1893 % 3074c7249d20 (1) E1 1893 o 3074c7249d20 (1) E1
1894 1894
1895 $ cd .. 1895 $ cd ..
1896 1896
1897 Phase divergence with file removal cancelation 1897 Phase divergence with file removal cancelation
1898 ============================================== 1898 ==============================================