tests/test-evolve-content-divergent-stack.t
branchmercurial-4.7
changeset 4672 653c42af172e
parent 4512 7a779a288793
parent 4633 61c2518cd6d2
child 4675 79bc0f1a832e
child 5090 2631e735ec16
equal deleted inserted replaced
4671:63a816beee7e 4672:653c42af172e
    44   requesting all changes
    44   requesting all changes
    45   adding changesets
    45   adding changesets
    46   adding manifests
    46   adding manifests
    47   adding file changes
    47   adding file changes
    48   added 5 changesets with 5 changes to 5 files
    48   added 5 changesets with 5 changes to 5 files
    49   new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
    49   new changesets 8fa14d15e168:c41c793e0ef1
    50   (run 'hg update' to get a working copy)
    50   (run 'hg update' to get a working copy)
    51   $ hg glog
    51   $ hg glog
    52   o  4:c41c793e0ef1 added d
    52   o  4:c41c793e0ef1 added d
    53   |   () [default] draft
    53   |   () [default] draft
    54   o  3:ca1b80f7960a added c
    54   o  3:ca1b80f7960a added c
   114   adding manifests
   114   adding manifests
   115   adding file changes
   115   adding file changes
   116   added 4 changesets with 0 changes to 4 files (+1 heads)
   116   added 4 changesets with 0 changes to 4 files (+1 heads)
   117   5 new obsolescence markers
   117   5 new obsolescence markers
   118   8 new content-divergent changesets
   118   8 new content-divergent changesets
   119   new changesets 82b74d5dc678:15c781f93cac (4 drafts)
   119   new changesets 82b74d5dc678:15c781f93cac
   120   (run 'hg heads' to see heads, 'hg merge' to merge)
   120   (run 'hg heads' to see heads, 'hg merge' to merge)
   121 
   121 
   122   $ hg glog
   122   $ hg glog
   123   *  12:15c781f93cac added d
   123   *  12:15c781f93cac added d
   124   |   () [default] draft
   124   |   () [default] draft
   205   requesting all changes
   205   requesting all changes
   206   adding changesets
   206   adding changesets
   207   adding manifests
   207   adding manifests
   208   adding file changes
   208   adding file changes
   209   added 5 changesets with 5 changes to 5 files
   209   added 5 changesets with 5 changes to 5 files
   210   new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
   210   new changesets 8fa14d15e168:c41c793e0ef1
   211   (run 'hg update' to get a working copy)
   211   (run 'hg update' to get a working copy)
   212 
   212 
   213   $ hg glog
   213   $ hg glog
   214   o  4:c41c793e0ef1 added d
   214   o  4:c41c793e0ef1 added d
   215   |   () [default] draft
   215   |   () [default] draft
   279   adding manifests
   279   adding manifests
   280   adding file changes
   280   adding file changes
   281   added 5 changesets with 1 changes to 5 files (+1 heads)
   281   added 5 changesets with 1 changes to 5 files (+1 heads)
   282   4 new obsolescence markers
   282   4 new obsolescence markers
   283   8 new content-divergent changesets
   283   8 new content-divergent changesets
   284   new changesets 2228e3b74514:d45f050514c2 (5 drafts)
   284   new changesets 2228e3b74514:d45f050514c2
   285   (run 'hg heads' to see heads, 'hg merge' to merge)
   285   (run 'hg heads' to see heads, 'hg merge' to merge)
   286 
   286 
   287   $ hg glog
   287   $ hg glog
   288   *  13:d45f050514c2 added d
   288   *  13:d45f050514c2 added d
   289   |   () [default] draft
   289   |   () [default] draft