tests/test-evolve-content-divergent-stack.t
branchmercurial-4.7
changeset 5090 2631e735ec16
parent 4993 e0b5ce458af5
parent 4672 653c42af172e
child 5162 a7fb433faab6
equal deleted inserted replaced
5089:55580b0b2b77 5090:2631e735ec16
    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
   208   requesting all changes
   208   requesting all changes
   209   adding changesets
   209   adding changesets
   210   adding manifests
   210   adding manifests
   211   adding file changes
   211   adding file changes
   212   added 5 changesets with 5 changes to 5 files
   212   added 5 changesets with 5 changes to 5 files
   213   new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
   213   new changesets 8fa14d15e168:c41c793e0ef1
   214   (run 'hg update' to get a working copy)
   214   (run 'hg update' to get a working copy)
   215 
   215 
   216   $ hg glog
   216   $ hg glog
   217   o  4:c41c793e0ef1 added d
   217   o  4:c41c793e0ef1 added d
   218   |   () [default] draft
   218   |   () [default] draft
   282   adding manifests
   282   adding manifests
   283   adding file changes
   283   adding file changes
   284   added 5 changesets with 1 changes to 5 files (+1 heads)
   284   added 5 changesets with 1 changes to 5 files (+1 heads)
   285   4 new obsolescence markers
   285   4 new obsolescence markers
   286   8 new content-divergent changesets
   286   8 new content-divergent changesets
   287   new changesets 2228e3b74514:d45f050514c2 (5 drafts)
   287   new changesets 2228e3b74514:d45f050514c2
   288   (run 'hg heads' to see heads, 'hg merge' to merge)
   288   (run 'hg heads' to see heads, 'hg merge' to merge)
   289 
   289 
   290   $ hg glog
   290   $ hg glog
   291   *  13:d45f050514c2 added d
   291   *  13:d45f050514c2 added d
   292   |   () [default] draft
   292   |   () [default] draft
   551   adding manifests
   551   adding manifests
   552   adding file changes
   552   adding file changes
   553   added 4 changesets with 1 changes to 5 files (+1 heads)
   553   added 4 changesets with 1 changes to 5 files (+1 heads)
   554   3 new obsolescence markers
   554   3 new obsolescence markers
   555   6 new content-divergent changesets
   555   6 new content-divergent changesets
   556   new changesets 9703820a7d5b:9a1f460df8b5 (4 drafts)
   556   new changesets 9703820a7d5b:9a1f460df8b5
   557   (run 'hg heads' to see heads, 'hg merge' to merge)
   557   (run 'hg heads' to see heads, 'hg merge' to merge)
   558   $ hg glog
   558   $ hg glog
   559   *  10:9a1f460df8b5 added dar
   559   *  10:9a1f460df8b5 added dar
   560   |   () [default] draft
   560   |   () [default] draft
   561   *  9:7dd5b9d42ef3 added bar and car
   561   *  9:7dd5b9d42ef3 added bar and car