[BUG] when doing a bzr pull with conflicts

[Aaron Bentley]

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

Robert Collins wrote:
> $append-their-stuff-to-mine could well degrade into
> $collapse-and-let-me-commit if the branches have diverged.

As I'm pretty sure I've mentioned before, pull is used for mirroring,
and in that case, pull should fail if the user has committed in their
mirror branch.  I suggested that perhaps mirror branches should be
marked as such, and commit disabled for them.

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

iD8DBQFDLjKG0F+nu1YWqI0RAl7LAJ0SE4rYDDfjQgIn46MlMPvTy06yBgCfWoTw
W3HvnOpjRxw3++rfch/a+VA=
=Xmlh
-----END PGP SIGNATURE-----