tests/test-rewind.t
changeset 4821 d8e36e60aea0
parent 4820 d842a4c6fc4a
child 4863 5cd7d16b8733
child 4899 c982e7fb5e7a
equal deleted inserted replaced
4820:d842a4c6fc4a 4821:d8e36e60aea0
   968   o  2: c_B0 (B)
   968   o  2: c_B0 (B)
   969   |
   969   |
   970   ~
   970   ~
   971 
   971 
   972   $ cd ..
   972   $ cd ..
       
   973 
       
   974 Rewind --keep
       
   975 =============
       
   976 
       
   977   $ hg init rewind-keep
       
   978   $ cd rewind-keep
       
   979   $ echo root > root
       
   980   $ hg ci -qAm 'root'
       
   981 
       
   982   $ echo apple > a
       
   983   $ echo banana > b
       
   984   $ hg ci -qAm initial
       
   985 
       
   986   $ hg rm b
       
   987   $ echo apricot > a
       
   988   $ echo coconut > c
       
   989   $ hg add c
       
   990   $ hg status
       
   991   M a
       
   992   A c
       
   993   R b
       
   994   $ hg amend -m amended
       
   995   $ hg glf --hidden
       
   996   @  2: amended (a c)
       
   997   |
       
   998   | x  1: initial (a b)
       
   999   |/
       
  1000   o  0: root (root)
       
  1001   
       
  1002 
       
  1003 Clean wdir
       
  1004 
       
  1005   $ hg rewind --keep --to 'desc("initial")' --hidden
       
  1006   rewinded to 1 changesets
       
  1007   (1 changesets obsoleted)
       
  1008   $ hg obslog
       
  1009   @    b4c97fddc16a (3) initial
       
  1010   |\
       
  1011   x |  2ea5be2f8751 (2) amended
       
  1012   |/     rewritten(description, meta, content) as b4c97fddc16a using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
       
  1013   |
       
  1014   x  30704102d912 (1) initial
       
  1015        rewritten(description, content) as 2ea5be2f8751 using amend by test (Thu Jan 01 00:00:06 1970 +0000)
       
  1016        rewritten(meta) as b4c97fddc16a using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
       
  1017   
       
  1018   $ hg glf --hidden
       
  1019   @  3: initial (a b)
       
  1020   |
       
  1021   | x  2: amended (a c)
       
  1022   |/
       
  1023   | x  1: initial (a b)
       
  1024   |/
       
  1025   o  0: root (root)
       
  1026   
       
  1027   $ hg st
       
  1028   M a
       
  1029   A c
       
  1030   R b
       
  1031 
       
  1032 Making wdir even more dirty
       
  1033 
       
  1034   $ echo avocado > a
       
  1035   $ echo durian > d
       
  1036   $ hg st
       
  1037   M a
       
  1038   A c
       
  1039   R b
       
  1040   ? d
       
  1041 
       
  1042 No rewinding without --keep
       
  1043 
       
  1044   $ hg rewind --to 'desc("amended")' --hidden
       
  1045   abort: uncommitted changes
       
  1046   [255]
       
  1047 
       
  1048 XXX: Unfortunately, even with --keep it's not allowed
       
  1049 
       
  1050   $ hg rewind --keep --to 'desc("amended")' --hidden
       
  1051   abort: uncommitted changes
       
  1052   [255]