Mercurial > hg

annotate tests/bundles/test-merge-symlinks.hg @ 26681:ca8170b5d370

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: delete shelve statefile on any exception during abort When a user's repository is in an unfinished unshelve state and they choose to abort, at a minimum, the repo should be out of that state. We've found situations where the user could not leave the state unless manually deleting the state file. This fix ensures that no matter what exception may be raised during the abort, the shelved state file will be deleted, the user will be out of the unshelve state and they can get their repository into a workable condition.
author Christian Delahousse <cdelahousse@fb.com>
date Wed, 14 Oct 2015 20:35:06 -0700
parents cd3032437064
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14116
cd3032437064 tests: move test bundles in a bundles/ subdirectory
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 5408
diff changeset
1 (binary:application/octet-stream)