tests/test-evolve-phase-divergence.t
branchmercurial-4.6
changeset 4513 d70db7e455dc
parent 4360 522abf1d70b7
parent 4512 7a779a288793
child 4516 f54bb6eaf5e6
child 4673 3ef4980353af
equal deleted inserted replaced
4512:7a779a288793 4513:d70db7e455dc
   122   $ hg pull ../public
   122   $ hg pull ../public
   123   pulling from ../public
   123   pulling from ../public
   124   searching for changes
   124   searching for changes
   125   no changes found
   125   no changes found
   126   1 new phase-divergent changesets
   126   1 new phase-divergent changesets
   127   1 local changesets published
       
   128 
   127 
   129   $ hg glog
   128   $ hg glog
   130   @  2:98bb3a6cfe1a tweak a
   129   @  2:98bb3a6cfe1a tweak a
   131   |   () draft
   130   |   () draft
   132   | o  1:4d1169d82e47 modify a
   131   | o  1:4d1169d82e47 modify a
   292   $ hg pull ../public
   291   $ hg pull ../public
   293   pulling from ../public
   292   pulling from ../public
   294   searching for changes
   293   searching for changes
   295   no changes found
   294   no changes found
   296   1 new phase-divergent changesets
   295   1 new phase-divergent changesets
   297   1 local changesets published
       
   298 
   296 
   299   $ hg glog
   297   $ hg glog
   300   @  4:d47f2b37ed82 added bar to foo
   298   @  4:d47f2b37ed82 added bar to foo
   301   |   (bm) draft
   299   |   (bm) draft
   302   | o  3:aa071e5554e3 added foo to foo
   300   | o  3:aa071e5554e3 added foo to foo
   425   adding changesets
   423   adding changesets
   426   adding manifests
   424   adding manifests
   427   adding file changes
   425   adding file changes
   428   added 1 changesets with 1 changes to 1 files
   426   added 1 changesets with 1 changes to 1 files
   429   new changesets b756eb10ea73
   427   new changesets b756eb10ea73
   430   1 local changesets published
       
   431   (run 'hg update' to get a working copy)
   428   (run 'hg update' to get a working copy)
   432 
   429 
   433   $ hg push ../public
   430   $ hg push ../public
   434   pushing to ../public
   431   pushing to ../public
   435   searching for changes
   432   searching for changes
   447   $ hg pull ../public
   444   $ hg pull ../public
   448   pulling from ../public
   445   pulling from ../public
   449   searching for changes
   446   searching for changes
   450   no changes found
   447   no changes found
   451   1 new phase-divergent changesets
   448   1 new phase-divergent changesets
   452   1 local changesets published
       
   453 
   449 
   454   $ hg glog
   450   $ hg glog
   455   @  7:2c3560aedead foo to bar
   451   @  7:2c3560aedead foo to bar
   456   |   (bm) draft
   452   |   (bm) draft
   457   | o  6:b756eb10ea73 added bar to bar
   453   | o  6:b756eb10ea73 added bar to bar
   578   $ hg pull ../public
   574   $ hg pull ../public
   579   pulling from ../public
   575   pulling from ../public
   580   searching for changes
   576   searching for changes
   581   no changes found
   577   no changes found
   582   1 new phase-divergent changesets
   578   1 new phase-divergent changesets
   583   1 local changesets published
       
   584 
   579 
   585   $ hg obslog -r .
   580   $ hg obslog -r .
   586   @  334e300d6db5 (10) added x to x
   581   @  334e300d6db5 (10) added x to x
   587   |
   582   |
   588   o  2352021b3785 (9) added x to x
   583   o  2352021b3785 (9) added x to x