tests/test-shelve.t
changeset 26934 2fb17f60bffa
parent 26914 6839f2d4eea7
parent 26933 a7eecd021782
child 26942 d55d22840592
equal deleted inserted replaced
26932:eb49ffa39fe2 26934:2fb17f60bffa
  1172   $ mv ../corrupt-shelvedstate .hg/histedit-state
  1172   $ mv ../corrupt-shelvedstate .hg/histedit-state
  1173   $ hg unshelve --abort 2>&1 | grep 'rebase aborted'
  1173   $ hg unshelve --abort 2>&1 | grep 'rebase aborted'
  1174   rebase aborted
  1174   rebase aborted
  1175   $ hg up -C .
  1175   $ hg up -C .
  1176   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  1176   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
  1177 
       
  1178   $ cd ..
       
  1179 
       
  1180 Keep active bookmark while (un)shelving even on shared repo (issue4940)
       
  1181 -----------------------------------------------------------------------
       
  1182 
       
  1183   $ cat <<EOF >> $HGRCPATH
       
  1184   > [extensions]
       
  1185   > share =
       
  1186   > EOF
       
  1187 
       
  1188   $ hg bookmarks -R repo
       
  1189      test                      4:33f7f61e6c5e
       
  1190   $ hg share -B repo share
       
  1191   updating working directory
       
  1192   6 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
  1193   $ cd share
       
  1194 
       
  1195   $ hg bookmarks
       
  1196      test                      4:33f7f61e6c5e
       
  1197   $ hg bookmarks foo
       
  1198   $ hg bookmarks
       
  1199    * foo                       5:703117a2acfb
       
  1200      test                      4:33f7f61e6c5e
       
  1201   $ echo x >> x
       
  1202   $ hg shelve
       
  1203   shelved as foo
       
  1204   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
  1205   $ hg bookmarks
       
  1206    * foo                       5:703117a2acfb
       
  1207      test                      4:33f7f61e6c5e
       
  1208 
       
  1209   $ hg unshelve
       
  1210   unshelving change 'foo'
       
  1211   $ hg bookmarks
       
  1212    * foo                       5:703117a2acfb
       
  1213      test                      4:33f7f61e6c5e
       
  1214 
       
  1215   $ cd ..