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.t
changeset 4471 3caa4a459439
parent 4454 f530850c8184
child 4472 5dbaabfe2c59
equal deleted inserted replaced
4470:046dd7718845 4471:3caa4a459439 
   358      --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
   358      --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
 
   359      +++ b/a	Thu Jan 01 00:00:00 1970 +0000
 
   359      +++ b/a	Thu Jan 01 00:00:00 1970 +0000
 
   360      @@ -0,0 +1,1 @@
 
   360      @@ -0,0 +1,1 @@
 
   361      +a
 
   361      +a
 
   362   
   362   
   363 Check that we don't have any troubled cset now:
 
   363 Check that we don't have any unstable cset now:
 
   364   $ hg evolve -l
 
   364   $ hg evolve -l
 
   365   $ cd ..
 
   365   $ cd ..
 
   366 
   366 
   367 Testing the case when csets are on different parent and no conflict in relocation and merging:
 
   367 Testing the case when csets are on different parent and no conflict in relocation and merging:
 
   368 ----------------------------------------------------------------------------------------------
 
   368 ----------------------------------------------------------------------------------------------
evolve