tests/test-evolve.t
branchmercurial-4.6
changeset 4171 e541acefbaa5
parent 4074 eb4d07a0b19f
parent 4168 8eec9422bd8e
child 4173 e268f7fd7839
child 4204 2a7f89817540
equal deleted inserted replaced
4170:50b8b06be26d 4171:e541acefbaa5
  1251   [255]
  1251   [255]
  1252 
  1252 
  1253 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
  1253 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
  1254 
  1254 
  1255   $ hg --hidden up 14
  1255   $ hg --hidden up 14
       
  1256   updating to a hidden changeset 484fb3cfa7f2
       
  1257   (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
  1256   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1258   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1257   updated to hidden changeset 484fb3cfa7f2
       
  1258   (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
       
  1259   working directory parent is obsolete! (484fb3cfa7f2)
  1259   working directory parent is obsolete! (484fb3cfa7f2)
  1260   $ cat >> $HGRCPATH <<EOF
  1260   $ cat >> $HGRCPATH <<EOF
  1261   > [experimental]
  1261   > [experimental]
  1262   > evolutioncommands=evolve
  1262   > evolutioncommands=evolve
  1263   > EOF
  1263   > EOF
  1264   $ hg --hidden up 15
  1264   $ hg --hidden up 15
       
  1265   updating to a hidden changeset daa1ff1c7fbd
       
  1266   (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
  1265   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1267   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  1266   updated to hidden changeset daa1ff1c7fbd
       
  1267   (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
       
  1268   working directory parent is obsolete! (daa1ff1c7fbd)
  1268   working directory parent is obsolete! (daa1ff1c7fbd)
  1269   (use 'hg evolve' to update to its successor: 0c049e4e5422)
  1269   (use 'hg evolve' to update to its successor: 0c049e4e5422)
  1270 
  1270 
  1271 Restore all of the evolution features
  1271 Restore all of the evolution features
  1272 
  1272 
  1570 
  1570 
  1571   $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
  1571   $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
  1572   @  1:ab832e43dd5a added a
  1572   @  1:ab832e43dd5a added a
  1573   
  1573   
  1574   $ hg up f7ad41964313 --hidden
  1574   $ hg up f7ad41964313 --hidden
       
  1575   updating to a hidden changeset f7ad41964313
       
  1576   (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a)
  1575   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1577   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1576   updated to hidden changeset f7ad41964313
       
  1577   (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a)
       
  1578   working directory parent is obsolete! (f7ad41964313)
  1578   working directory parent is obsolete! (f7ad41964313)
  1579   (use 'hg evolve' to update to its successor: ab832e43dd5a)
  1579   (use 'hg evolve' to update to its successor: ab832e43dd5a)
  1580 
  1580 
  1581   $ hg bookmark book
  1581   $ hg bookmark book
  1582 
  1582