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-public-content-divergent-corner-cases.t
changeset 4607 d314deb12f08
parent 4583 4fcf9a71befc
child 4625 a4fde4e3e763
equal deleted inserted replaced
4606:6c3f4cfa582e 4607:d314deb12f08 
   641   rebasing "other" content-divergent changeset b4a584aea4bd on eb1b4e1205b8
 
   641   rebasing "other" content-divergent changeset b4a584aea4bd on eb1b4e1205b8
 
   642   updating to "local" side of the conflict: c7d2d47c7240
 
   642   updating to "local" side of the conflict: c7d2d47c7240
 
   643   merging "other" content-divergent changeset '0773642cfa95'
 
   643   merging "other" content-divergent changeset '0773642cfa95'
 
   644   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   644   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   645   content divergence resolution between c7d2d47c7240 (public) and 0773642cfa95 has same content as c7d2d47c7240, discarding 0773642cfa95
 
   645   content divergence resolution between c7d2d47c7240 (public) and 0773642cfa95 has same content as c7d2d47c7240, discarding 0773642cfa95
 
   646   1 new orphan changesets
 
       
   647   merge:[8] c_F
 
   646   merge:[8] c_F
 
   648   with: [10] c_F
 
   647   with: [10] c_F
 
   649   base: [6] c_F
 
   648   base: [6] c_F
 
   650   rebasing "other" content-divergent changeset 8ae8db670b4a on c7d2d47c7240
 
   649   rebasing "other" content-divergent changeset 8ae8db670b4a on c7d2d47c7240
 
   651   updating to "local" side of the conflict: a52ac76b45f5
 
   650   updating to "local" side of the conflict: a52ac76b45f5
evolve