[bug 0.11] commit succeeds with conflict markers in the file

[John Arbash Meinel]

Jari Aalto wrote:
> John Arbash Meinel <john at arbash-meinel.com> writes:
> 
>> Jari Aalto wrote:
>>> Consider this
>>>
>>>     $ bzr merge ../a
>>>     <conflict, hack, hack, remove unneeded files>
>>>     $ bzr resolved file.txt
>>>     $ bzr ci -m "Done"
>>>
>>> Ah, but there still was left confluct markers that escaped the eyes of
>>> the developer, who *thought* all was resolved, when it was not:
>> I think what we actually worked out was to make 'bzr resolve' not
>> resolve a file if <<< is detected.
> 
> Thank you, exactly to the point. Can we hope that to be in 0.13?
> 
> Jari

It won't be in 0.13, because 0.13rc1 has already been released. And 0.13
will only include security/bug fixes over the rc1.

However, it should be in 0.14, though I think Aaron wasn't entirely
comfortable with the request.

You can see his original patch here:
http://bundlebuggy.aaronbentley.com/request/%3C454ED91E.5050808@utoronto.ca%3E

You can also look through the archives for that thread to catch up on
what we had discussed.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061201/6e5568a1/attachment.pgp