[bug 0.11] commit succeeds with conflict markers in the file
jari.aalto at cante.net
Fri Dec 1 18:20:04 GMT 2006
$ 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:
Nonetheless, up we go and "bzr ci" added the file to wait for better
time to mess up the build.
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
bzr ci --force ...
No interactive questions this time, pretty please.
More information about the bazaar