##// END OF EJS Templates
shelve: stop testing missing rebase state file...
Boris Feld -
r38483:a8f99334 default
parent child Browse files
Show More
@@ -1262,29 +1262,17 b' test .orig files go where the user wants'
1262
1262
1263 test Abort unshelve always gets user out of the unshelved state
1263 test Abort unshelve always gets user out of the unshelved state
1264 ---------------------------------------------------------------
1264 ---------------------------------------------------------------
1265 Wreak havoc on the unshelve process
1266 $ rm .hg/unshelverebasestate
1267 $ hg unshelve --abort
1268 unshelve of 'default' aborted
1269
1265
1270 Try again but with a corrupted shelve state file
1266 with a corrupted shelve state file
1271 $ hg up -r 0 -q
1272 $ echo '' > root
1273 $ hg shelve -q
1274 $ echo 'contADDent' > root
1275 $ hg unshelve -q
1276 warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
1277 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
1278 [1]
1279 $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate
1267 $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate
1280 $ mv ../corrupt-shelvedstate .hg/shelvestate
1268 $ mv ../corrupt-shelvedstate .hg/shelvestate
1281 $ hg unshelve --abort 2>&1 | grep 'aborted'
1269 $ hg unshelve --abort 2>&1 | grep 'aborted'
1282 unshelve of 'default-01' aborted
1270 unshelve of 'default' aborted
1283 $ hg summary
1271 $ hg summary
1284 parent: 0:ae8c668541e8 tip
1272 parent: 0:ae8c668541e8 tip
1285 root
1273 root
1286 branch: default
1274 branch: default
1287 commit: 1 modified, 1 unknown
1275 commit: 1 modified
1288 update: (current)
1276 update: (current)
1289 phases: 1 draft
1277 phases: 1 draft
1290 $ hg up -C .
1278 $ hg up -C .
General Comments 0
You need to be logged in to leave comments. Login now