tests/test-evolve-content-divergence.t
changeset 4093 ef22eef37ecc
parent 3882 55b8c7e7e352
child 4122 4eb3877540f1
equal deleted inserted replaced
4092:6f391c2a773b 4093:ef22eef37ecc
   792   requesting all changes
   792   requesting all changes
   793   adding changesets
   793   adding changesets
   794   adding manifests
   794   adding manifests
   795   adding file changes
   795   adding file changes
   796   added 5 changesets with 5 changes to 5 files
   796   added 5 changesets with 5 changes to 5 files
   797   new changesets 8fa14d15e168:c41c793e0ef1
   797   new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
   798   (run 'hg update' to get a working copy)
   798   (run 'hg update' to get a working copy)
   799   $ hg glog
   799   $ hg glog
   800   o  4:c41c793e0ef1 added d
   800   o  4:c41c793e0ef1 added d
   801   |   () [default] draft
   801   |   () [default] draft
   802   o  3:ca1b80f7960a added c
   802   o  3:ca1b80f7960a added c
   868   adding manifests
   868   adding manifests
   869   adding file changes
   869   adding file changes
   870   added 4 changesets with 0 changes to 4 files (+1 heads)
   870   added 4 changesets with 0 changes to 4 files (+1 heads)
   871   5 new obsolescence markers
   871   5 new obsolescence markers
   872   8 new content-divergent changesets
   872   8 new content-divergent changesets
   873   new changesets 82b74d5dc678:15c781f93cac
   873   new changesets 82b74d5dc678:15c781f93cac (4 drafts)
   874   (run 'hg heads' to see heads, 'hg merge' to merge)
   874   (run 'hg heads' to see heads, 'hg merge' to merge)
   875 
   875 
   876   $ hg glog
   876   $ hg glog
   877   *  12:15c781f93cac added d
   877   *  12:15c781f93cac added d
   878   |   () [default] draft
   878   |   () [default] draft