Mercurial Mercurial > pub > hg > evolve / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve-content-divergent-relocation.t
changeset 5349 e8660b28bfee
parent 5345 a73cdef2e33f
child 5367 cb5983c0287f
equal deleted inserted replaced
5348:a9f9edb168a1 5349:e8660b28bfee 
   107   da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
 
   107   da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
 
   108   7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
 
   108   7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
 
   109   11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
 
   109   11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
 
   110   $ hg obslog --all
 
   110   $ hg obslog --all
 
   111   @    e7fdc662d630 (8) added b
 
   111   @    e7fdc662d630 (8) added b
 
   112   |\
 
   112   |\     amended(content) from 11f849d7159f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   113   | |    rewritten from 7ed0642d644b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   114   | |
 
   113   x |  11f849d7159f (7) added b
 
   115   x |  11f849d7159f (7) added b
 
   114   | |    amended(content) as e7fdc662d630 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   116   | |    rebased(parent) from da4b96f4a8d6 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   115   | |
 
   117   | |
 
   116   | x  7ed0642d644b (5) added b
 
   118   | x  7ed0642d644b (5) added b
 
   117   | |    rewritten as e7fdc662d630 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   119   | |    amended(content) from b1661037fa25 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   118   | |
 
   120   | |
 
   119   x |  da4b96f4a8d6 (6) added b
 
   121   x |  da4b96f4a8d6 (6) added b
 
   120   |/     rebased(parent) as 11f849d7159f using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   122   |/     rebased(parent) from b1661037fa25 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 
   121   |
 
   123   |
 
   122   x  b1661037fa25 (2) added b
 
   124   x  b1661037fa25 (2) added b
 
   123        amended(content) as 7ed0642d644b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   124        rebased(parent) as da4b96f4a8d6 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   125   
   125   
   126 
   126 
   127 Resolving orphans to get back to a normal graph
 
   127 Resolving orphans to get back to a normal graph
 
   128 
   128 
   129   $ hg evolve --all
 
   129   $ hg evolve --all
 
   236   5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
 
   236   5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
 
   237   45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
 
   237   45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'}
 
   238   911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
 
   238   911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
 
   239   $ hg obslog --all
 
   239   $ hg obslog --all
 
   240   @    4e844ab5e814 (15) added foo to x
 
   240   @    4e844ab5e814 (15) added foo to x
 
   241   |\
 
   241   |\     rewritten(description, branch, content) from 45e15d6e88f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   242   | |    rewritten from 911c21adca13 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   243   | |
 
   242   x |  45e15d6e88f5 (13) added x
 
   244   x |  45e15d6e88f5 (13) added x
 
   243   | |    rewritten(description, branch, content) as 4e844ab5e814 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   245   | |    rebased(parent) from 801b5920c7ea using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 
   244   | |
 
   246   | |
 
   245   | x  911c21adca13 (14) added foo to x
 
   247   | x  911c21adca13 (14) added foo to x
 
   246   | |    rewritten as 4e844ab5e814 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   248   | |    rebased(parent) from 5cf74a13db18 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   247   | |
 
   249   | |
 
   248   | x  5cf74a13db18 (12) added foo to x
 
   250   | x  5cf74a13db18 (12) added foo to x
 
   249   |/     rebased(parent) as 911c21adca13 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   251   |/     rewritten(description, branch, content) from 801b5920c7ea using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   250   |
 
   252   |
 
   251   x  801b5920c7ea (11) added x
 
   253   x  801b5920c7ea (11) added x
 
   252        rebased(parent) as 45e15d6e88f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   253        rewritten(description, branch, content) as 5cf74a13db18 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   254   
   254   
   255 
   255 
   256 Testing when both the content-divergence are on different parents and resolution
 
   256 Testing when both the content-divergence are on different parents and resolution
 
   257 will lead to conflicts
 
   257 will lead to conflicts
 
   258 ---------------------------------------------------------------------------------
 
   258 ---------------------------------------------------------------------------------
 
   354   9c32d35206fb5c3bf0ac814d410914d54a959a87 0fc12918c8daa12ca83ce1e2a38e252b063b6276 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
 
   354   9c32d35206fb5c3bf0ac814d410914d54a959a87 0fc12918c8daa12ca83ce1e2a38e252b063b6276 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
 
   355   0faa43228ee7fb9c993f076cef7e2ac14c85954b ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
 
   355   0faa43228ee7fb9c993f076cef7e2ac14c85954b ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
 
   356   0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
 
   356   0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
 
   357   $ hg obslog -r . --all
 
   357   $ hg obslog -r . --all
 
   358   @    ba11a9f47a2e (21) added y
 
   358   @    ba11a9f47a2e (21) added y
 
   359   |\
 
   359   |\     amended(content) from 0faa43228ee7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   360   | |    rewritten(branch, content) from 0fc12918c8da using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   361   | |
 
   360   x |  0faa43228ee7 (19) added y
 
   362   x |  0faa43228ee7 (19) added y
 
   361   | |    amended(content) as ba11a9f47a2e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   363   | |    amended(content) from 1bb931596137 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   362   | |
 
   364   | |
 
   363   | x  0fc12918c8da (20) added y
 
   365   | x  0fc12918c8da (20) added y
 
   364   | |    rewritten(branch, content) as ba11a9f47a2e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   366   | |    rebased(parent) from 9c32d35206fb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   365   | |
 
   367   | |
 
   366   x |  1bb931596137 (18) added y
 
   368   x |  1bb931596137 (18) added y
 
   367   | |    amended(content) as 0faa43228ee7 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   369   | |    rewritten(branch, parent) from ecf1d3992eb4 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 
   368   | |
 
   370   | |
 
   369   | x  9c32d35206fb (17) added y
 
   371   | x  9c32d35206fb (17) added y
 
   370   |/     rebased(parent) as 0fc12918c8da using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   372   |/     amended(content) from ecf1d3992eb4 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   371   |
 
   373   |
 
   372   x  ecf1d3992eb4 (16) added y
 
   374   x  ecf1d3992eb4 (16) added y
 
   373        rewritten(branch, parent) as 1bb931596137 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   374        amended(content) as 9c32d35206fb using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   375   
   375   
   376 
   376 
   377 checking that relocated commit is there
 
   377 checking that relocated commit is there
 
   378   $ hg exp 20 --hidden
 
   378   $ hg exp 20 --hidden
 
   379   # HG changeset patch
 
   379   # HG changeset patch
 
   579   9bc2ace42175da7380251fca97730f62ff5b9185 a7326a0785271a7bef2e812a9a742fb4256b4a3c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
 
   579   9bc2ace42175da7380251fca97730f62ff5b9185 a7326a0785271a7bef2e812a9a742fb4256b4a3c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'}
 
   580   ad2ec16eca1eac4cf5045b496efa6205652e9a02 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
 
   580   ad2ec16eca1eac4cf5045b496efa6205652e9a02 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
 
   581   a7326a0785271a7bef2e812a9a742fb4256b4a3c 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
 
   581   a7326a0785271a7bef2e812a9a742fb4256b4a3c 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'}
 
   582   $ hg obslog --all
 
   582   $ hg obslog --all
 
   583   @    45e55c9ab3d0 (27) added z
 
   583   @    45e55c9ab3d0 (27) added z
 
   584   |\
 
   584   |\     rewritten(branch, content) from a7326a078527 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   585   | |    amended(content) from ad2ec16eca1e using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   586   | |
 
   585   x |  a7326a078527 (26) added z
 
   587   x |  a7326a078527 (26) added z
 
   586   | |    rewritten(branch, content) as 45e55c9ab3d0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   588   | |    rewritten(parent, content) from 9bc2ace42175 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   587   | |
 
   589   | |
 
   588   | x  ad2ec16eca1e (25) added z
 
   590   | x  ad2ec16eca1e (25) added z
 
   589   | |    amended(content) as 45e55c9ab3d0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   591   | |    amended(content) from ee19d6cc6704 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   590   | |
 
   592   | |
 
   591   x |  9bc2ace42175 (23) added z
 
   593   x |  9bc2ace42175 (23) added z
 
   592   | |    rewritten(parent, content) as a7326a078527 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   594   | |    amended(content) from 2048a66e8834 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   593   | |
 
   595   | |
 
   594   | x  ee19d6cc6704 (24) added z
 
   596   | x  ee19d6cc6704 (24) added z
 
   595   |/     amended(content) as ad2ec16eca1e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   597   |/     rewritten(branch, parent) from 2048a66e8834 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 
   596   |
 
   598   |
 
   597   x  2048a66e8834 (22) added z
 
   599   x  2048a66e8834 (22) added z
 
   598        amended(content) as 9bc2ace42175 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   599        rewritten(branch, parent) as ee19d6cc6704 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   600   
   600   
   601 
   601 
   602   $ cd ..
 
   602   $ cd ..
 
   603 
   603 
   604 Testing when relocation results in nothing to commit
 
   604 Testing when relocation results in nothing to commit
 
   690   befae61385695f1ae4b78b030ad91075b2b523ef cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
 
   690   befae61385695f1ae4b78b030ad91075b2b523ef cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'}
 
   691   bf4fe3a3afeb14c338094f41a35863921856592f cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
 
   691   bf4fe3a3afeb14c338094f41a35863921856592f cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
 
   692   88473f9137d12e90055d30bbb9b78dd786520870 916b4ec3b91fd03826bd4b179051ae3cee633b56 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
 
   692   88473f9137d12e90055d30bbb9b78dd786520870 916b4ec3b91fd03826bd4b179051ae3cee633b56 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
 
   693   $ hg obslog -r 'desc("divergent")' --all
 
   693   $ hg obslog -r 'desc("divergent")' --all
 
   694   o    cc3d0c6117c7 (7) divergent
 
   694   o    cc3d0c6117c7 (7) divergent
 
   695   |\
 
   695   |\     amended(content) from befae6138569 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   696   | |    rewritten from bf4fe3a3afeb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   697   | |
 
   696   x |  befae6138569 (3) divergent
 
   698   x |  befae6138569 (3) divergent
 
   697   | |    amended(content) as cc3d0c6117c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   699   | |    rebased(parent) from 898ddd4443b3 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 
   698   | |
 
   700   | |
 
   699   | x  bf4fe3a3afeb (6) divergent
 
   701   | x  bf4fe3a3afeb (6) divergent
 
   700   | |    rewritten as cc3d0c6117c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   702   | |    rewritten(parent, content) from 4cc21313ecee using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   701   | |
 
   703   | |
 
   702   | x  4cc21313ecee (4) divergent
 
   704   | x  4cc21313ecee (4) divergent
 
   703   |/     rewritten(parent, content) as bf4fe3a3afeb using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
 
   705   |/     amended(content) from 898ddd4443b3 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
   704   |
 
   706   |
 
   705   x  898ddd4443b3 (2) divergent
 
   707   x  898ddd4443b3 (2) divergent
 
   706        amended(content) as 4cc21313ecee using amend by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   707        rebased(parent) as befae6138569 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
 
       
   708   
   708   
   709   $ cd ..
 
   709   $ cd ..
evolve