tests/test-evolve.t
branchstable
changeset 1099 bac4e0bc9f6a
parent 1067 5d063fed9e3d
child 1104 cb36a4eb0157
equal deleted inserted replaced
1098:1527ec81337e 1099:bac4e0bc9f6a
   268   c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'user': 'test'} (glob)
   268   c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'user': 'test'} (glob)
   269   $ hg evolve
   269   $ hg evolve
   270   move:[4] another feature
   270   move:[4] another feature
   271   atop:[6] a nifty feature
   271   atop:[6] a nifty feature
   272   merging main-file-1
   272   merging main-file-1
       
   273   working directory is now at abe98aeaaa35
   273   $ hg log
   274   $ hg log
   274   7	feature-B: another feature - test
   275   7	feature-B: another feature - test
   275   6	feature-A: a nifty feature - test
   276   6	feature-A: a nifty feature - test
   276   0	: base - test
   277   0	: base - test
   277 
   278 
   309   $ hg evolve --any --traceback
   310   $ hg evolve --any --traceback
   310   recreate:[8] another feature that rox
   311   recreate:[8] another feature that rox
   311   atop:[7] another feature
   312   atop:[7] another feature
   312   computing new diff
   313   computing new diff
   313   committed as ca3b75e3e59b
   314   committed as ca3b75e3e59b
       
   315   working directory is now at ca3b75e3e59b
   314   $ hg glog
   316   $ hg glog
   315   @  9	feature-B: bumped update to abe98aeaaa35: - test
   317   @  9	feature-B: bumped update to abe98aeaaa35: - test
   316   |
   318   |
   317   o  7	: another feature - test
   319   o  7	: another feature - test
   318   |
   320   |
   367   atop:[13] dansk!
   369   atop:[13] dansk!
   368   merging main-file-1
   370   merging main-file-1
   369   move:[11] dansk 3!
   371   move:[11] dansk 3!
   370   atop:[14] dansk 2!
   372   atop:[14] dansk 2!
   371   merging main-file-1
   373   merging main-file-1
       
   374   working directory is now at b0e2cfb8dd21
   372   $ hg glog
   375   $ hg glog
   373   @  15	: dansk 3! - test
   376   @  15	: dansk 3! - test
   374   |
   377   |
   375   o  14	: dansk 2! - test
   378   o  14	: dansk 2! - test
   376   |
   379   |
   729   1 changesets pruned
   732   1 changesets pruned
   730   1 new unstable changesets
   733   1 new unstable changesets
   731   $ hg stab --any
   734   $ hg stab --any
   732   move:[15] c
   735   move:[15] c
   733   atop:[13] a
   736   atop:[13] a
       
   737   working directory is now at 3742bde73477
   734   $ hg st -C --change=tip
   738   $ hg st -C --change=tip
   735   A c
   739   A c
   736     a
   740     a
   737   R a
   741   R a
   738 
   742