[MERGE REVIEW] Tweaks to bundle merging

[Aaron Bentley]

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

Alexander Belchenko wrote:
> Aaron Bentley пишет:
>> Alexander Belchenko has recently experienced problems because bzr merge
>> conflates malformed bundles and not-a-bundle situations.

> Actually my problem arise because of line-endings problem: 

There were multiple problems.  You didn't get good diagnostics because
of the conflation of BadBundle and NotABundle

BundleReadder
> expect to see LF-only line-endings but instead got CRLF. During merge
> there is MailformedBundle error raised and after then merge switch to
> interpret bundle filepath as merge-branch location.

We've been talking about this.  The solution we're leading toward is
forcing the output to contain LF only.

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

iD8DBQFEhfVb0F+nu1YWqI0RAnBDAJoD7viWiuIrjIh+Vx+ZlkRcQc+oBACfS4T2
7QLjO5K2cmha6NgytITwtcg=
=lllc
-----END PGP SIGNATURE-----