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

[John Arbash Meinel]

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.

Aaron has already worked out a patch for that. We actually requested
that he extend it so just doing something like 'bzr resolve' would
autodetect anything that has already been resolved.

I don't remember exactly where it ended.

My personal feeling is that '--force' is a big hammer, that I want to be
careful we don't train users to get too used to using. Because it may be
used in commands that are pretty major things. Like bzr uncommit --force
used to actually remove the revision data from the store without
prompting, which was a very destructive operation. Which is a much
bigger --force than 'commit --force'.

I would be happier with 'commit --allow-conflicts'. Though I think our
proposed method of checking at 'bzr resolve' time is a much better fix.

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/66d7c39c/attachment.pgp