[RFC] How to better assist users in resolving conflicts

[Vincent Ladeuil]

>>>>> "bialix" == Alexander Belchenko <bialix at ukr.net> writes:

<snip/>

    bialix> We have one: qconflicts.

Sure. 

Does it provides actions for tree shape conflicts ? 

If yes, then let's compare notes, if not, can you have a look at
the patch and tell me if the proposed changes sounds appropriate
for it.

    bialix> One thing that constantly irritate me: why `bzr
    bialix> resolve --auto` don't auto mark file path conflict as
    bialix> resolved when I manually change the paths (foo vs
    bialix> foo.moved) as needed?

See my proposed patch about what could be done there, I've added
commented TODO in bzrlib/help_topics/en/conflicts.txt :)

    bialix> So I remove/rename foo.moved and there is no more
    bialix> conflicted file, but `bzr resolve` won't make my life
    bialix> easier. Why?

I don't know the reasons but --auto works only for text conflicts
*today*. I'd like to change that as much as you.

    bialix> Ditto for binary files conflicts. If I delete
    bialix> OTHER/THIS then there is no more conflict?

I've spotted these ones and add TODOs for them, if I missed some,
please tell me !

    bialix> No?

Yes.

        Vincent