tests/test-tutorial.t
branchstable
changeset 1099 bac4e0bc9f6a
parent 1064 95d84c8b4bcc
child 1107 1c227ecb744d
child 1110 875e671c3cd8
equal deleted inserted replaced
1098:1527ec81337e 1099:bac4e0bc9f6a
   700 
   700 
   701   $ hg evolve
   701   $ hg evolve
   702   move:[15] animals
   702   move:[15] animals
   703   atop:[14] bathroom stuff
   703   atop:[14] bathroom stuff
   704   merging shopping
   704   merging shopping
       
   705   working directory is now at ee942144f952
   705 
   706 
   706 The old version of bathroom is hidden again.
   707 The old version of bathroom is hidden again.
   707 
   708 
   708   $ hg log -G
   709   $ hg log -G
   709   @  ee942144f952 (draft): animals
   710   @  ee942144f952 (draft): animals
   750   bf1b0d202029 (draft): animals
   751   bf1b0d202029 (draft): animals
   751   working directory parent is obsolete!
   752   working directory parent is obsolete!
   752   $ hg evolve
   753   $ hg evolve
   753   update:[8] animals
   754   update:[8] animals
   754   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   755   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
   756   working directory is now at ee942144f952
   755 
   757 
   756 Relocating unstable change after prune
   758 Relocating unstable change after prune
   757 ----------------------------------------------
   759 ----------------------------------------------
   758 
   760 
   759 The remote guy keep working
   761 The remote guy keep working
   827 
   829 
   828   $ hg evolve
   830   $ hg evolve
   829   move:[17] SPAM SPAM SPAM
   831   move:[17] SPAM SPAM SPAM
   830   atop:[14] bathroom stuff
   832   atop:[14] bathroom stuff
   831   merging shopping
   833   merging shopping
       
   834   working directory is now at 40aa40daeefb
   832 
   835 
   833   $ hg log -G
   836   $ hg log -G
   834   @  40aa40daeefb (draft): SPAM SPAM SPAM
   837   @  40aa40daeefb (draft): SPAM SPAM SPAM
   835   |
   838   |
   836   o  a44c85f957d3 (draft): bathroom stuff
   839   o  a44c85f957d3 (draft): bathroom stuff