Handling duplicate conflicts

[André Bachmann]

I'm thinking about duplicate conflicts and how to handle them in qbzr.
My idea is that if such conflicts happen, I want to be able to double-
click them in a qconflict window. Then my preferred merge application
should open FILE and FILE.moved. After I tried to merge them manually,
the result should be saved in FILE. Then 'bzr resolve --take-other'
should be called so that this conflict is marked as resolved.

What do you think, is this the right idea for this problem?

[Martin Pool]

I think that's fairly reasonable. It would be good if this case was
handled much more smoothly in bzr core, which is possible (and vila
had some ideas towards it) but for now this would be a good way to
handle it in qbzr.

One thing you could also do is show a per-file-id log on the two
conflicting files. Generally speaking I think showing the history
leading up to a conflict could be a useful thing to do.

Martin