bzr and conflicts

[louis <louis obsidian com au>]

I've just noticed  (and really surprised that it took me this long) that when using bzr, meld *never* recognizes text conflicts.

Looking at the code, it looks like it never has. An example of status output when there's a conflict:

$ bzr st -S

 M  file.py

C   Text conflict in file.py

As you can see, the file is listed twice, and the line with the conflict message actually won't match when _get_dirsandfiles is called, because it has the extra 'Text conflict in' stuff there.

A nicer way to do this might be to do the current status bit, then call $ bzr conflicts --text and if any of those files are already in the tree, update their status to conflicted?

Unfortunately this option might still do funny stuff with non text conflicts... but given it's broken already.

Is anyone else looking at this? Or should I take it and run with it?

Cheers,

--
Louis