[MERGE] Avoid losing data when converting a local branch to a lightweight checkout
John Arbash Meinel
john at arbash-meinel.com
Wed Apr 9 09:34:44 BST 2008
-----BEGIN PGP SIGNED MESSAGE-----
Aaron Bentley wrote:
| Hi all,
| Reconfigure doesn't do enough safety checks when converting something
| into a lightweight checkout. It should not succeed (unless forced) if
| the local branch is out of sync with the branch that would be used as
| the reference branch.
| This patch adds those checks, so that if the branches aren't in sync,
| the reconfiguration fails.
I don't think the error message is quite clear enough about what is wrong so
that the user knows what they can do to make things succeed.
It is much better than what we have, so it could be merged as is. But I have the
feeling someone getting UnsyncedBranches is going to be showing up on the
mailing list asking how to get Bazaar to do the thing they were asking it to do.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar