tests/test-evolve-content-divergent-stack.t
branchmercurial-4.7
changeset 4549 dcaf340841ef
parent 4512 7a779a288793
child 4516 f54bb6eaf5e6
child 4672 653c42af172e
equal deleted inserted replaced
4548:d3cc1b55ad0a 4549:dcaf340841ef
    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
   116   adding manifests
   116   adding manifests
   117   adding file changes
   117   adding file changes
   118   added 4 changesets with 0 changes to 4 files (+1 heads)
   118   added 4 changesets with 0 changes to 4 files (+1 heads)
   119   5 new obsolescence markers
   119   5 new obsolescence markers
   120   8 new content-divergent changesets
   120   8 new content-divergent changesets
   121   new changesets 82b74d5dc678:15c781f93cac (4 drafts)
   121   new changesets 82b74d5dc678:15c781f93cac
   122   (run 'hg heads' to see heads, 'hg merge' to merge)
   122   (run 'hg heads' to see heads, 'hg merge' to merge)
   123 
   123 
   124   $ hg glog
   124   $ hg glog
   125   *  12:15c781f93cac added d
   125   *  12:15c781f93cac added d
   126   |   () [default] draft
   126   |   () [default] draft
   216   requesting all changes
   216   requesting all changes
   217   adding changesets
   217   adding changesets
   218   adding manifests
   218   adding manifests
   219   adding file changes
   219   adding file changes
   220   added 5 changesets with 5 changes to 5 files
   220   added 5 changesets with 5 changes to 5 files
   221   new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
   221   new changesets 8fa14d15e168:c41c793e0ef1
   222   (run 'hg update' to get a working copy)
   222   (run 'hg update' to get a working copy)
   223 
   223 
   224   $ hg glog
   224   $ hg glog
   225   o  4:c41c793e0ef1 added d
   225   o  4:c41c793e0ef1 added d
   226   |   () [default] draft
   226   |   () [default] draft
   291   adding manifests
   291   adding manifests
   292   adding file changes
   292   adding file changes
   293   added 5 changesets with 1 changes to 5 files (+1 heads)
   293   added 5 changesets with 1 changes to 5 files (+1 heads)
   294   4 new obsolescence markers
   294   4 new obsolescence markers
   295   8 new content-divergent changesets
   295   8 new content-divergent changesets
   296   new changesets 2228e3b74514:d45f050514c2 (5 drafts)
   296   new changesets 2228e3b74514:d45f050514c2
   297   (run 'hg heads' to see heads, 'hg merge' to merge)
   297   (run 'hg heads' to see heads, 'hg merge' to merge)
   298 
   298 
   299   $ hg glog
   299   $ hg glog
   300   *  13:d45f050514c2 added d
   300   *  13:d45f050514c2 added d
   301   |   () [default] draft
   301   |   () [default] draft