General question regarding interrupting bzr operations

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Nicholas Allen wrote:
> After experiencing this problem with interrupting pull I was wondering
> if there may be similar problems in merge. Do you think that a power
> failure in the middle of a merge could leave a branch in a messed up
> state that it could not recover from?

Merge defers destructive operations until the end, and does them all at
once.  It's all unlink, rename and chmod, which are pretty fast.

If you're unlucky enough to have a power failure in that window, some
files may have been deleted, others may have been moved into
.bzr/checkout/limbo, and the inventory will not have been updated.

You'll need to rm -Rf ".bzr/checkout/limbo", then revert, then merge again.

This will work 99% of the time, because merge requires that there be no
local changes.

The bad case is when you do pull or update, since those permit you to
have local modifications.

> Just wondering if there would be a
> way to repair a branch in this happened?

Tree, actually.  Worst case: rm -Rf . .bzr/checkout; bzr checkout .

> Are there test cases that
> simulate this scenario and is bzr generally designed to handle these
> kinds of problems?

Manual recovery is typically needed.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFR3/70F+nu1YWqI0RAgOhAJ9uDcrmoJYaBgGT8HlxhCIH+o9ZsgCeLUT7
qEeUYJkvyvV3Kx+XhkXppFY=
=vcQw
-----END PGP SIGNATURE-----