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

Jelmer Vernooij jelmer at samba.org
Fri Dec 1 20:50:02 GMT 2006


On Fri, 2006-12-01 at 20:20 +0200, 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:
> 
>     <<<<<<< TREE
>     ...
>     =======
>     ...
>     >>>>>>> MERGE-SOURCE
> 
> Nonetheless, up we go and "bzr ci" added the file to wait for better
> time to mess up the build.
> 
> SUGGESTION
> 
> Please add checking for conflict markers and refuse to commit
> 
>     bzr ci ...
>     ERROR: conflict markers found in file.txt (to commit anyway, use -f)
>     
> unless option -f|--force is used (ahem, ci does not seem to have that
> optoion yet):
> 
>     bzr ci --force ...
> 
> No interactive questions this time, pretty please.
I think it'd be indeed nice to check for conflict markers, but I think
that should be done in "bzr resolved" rather than commit. I.e., "bzr
resolved" would have a --force option and would warn about leftover
conflict markers:

$ bzr resolved foo
ERROR: conflict markers found in file.txt (to resolve conflict anyway,
use -f)
$ bzr resolved --force foo
$ bzr ci ...


Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061201/df343283/attachment.pgp 


More information about the bazaar mailing list