Conflict handling

[Vincent LADEUIL]

>>>>> "Aaron" == Aaron Bentley <aaron.bentley at utoronto.ca> writes:

    Aaron> Vincent LADEUIL wrote:
    >>>>>>> "Aaron" == Aaron Bentley <aaron.bentley at utoronto.ca>
    >>>>>>> writes:
    >> On a second thought... I'm quite surprised that bzr can't
    >> detect that... He put them here in the first place no ?
    >> Conflicts should be first citizens and handled as such.

    Aaron> Yes, this code was originally a hack in bzrtools.

    Aaron> So what I'm planning is: 1. When conflicts are
    Aaron> encountered, .bzr/conflicts is created, and each kind
    Aaron> of conflict is marked as a line in it.

I may be  out of my league  here, but anyway I try  to help: does
.bzr/conflicts exists in all configurations where the user intend
to modify the files (checkouts, branches, etc) ?

    Aaron> 2. Running resolve will alter .bzr/conflicts, as well
    Aaron> as deleting .THIS, .BASE and .OTHER files

    Aaron> 3. bzr conflicts will produce the same conflict output
    Aaron> as bzr merge, except that it will omit conflicts that
    Aaron> have been resolved

Niiiiice touch !

    Aaron> Does this seem more first-class-citizenish?

Woohoo !!!!eleven 

You bet :-)

    Aaron> So it detects whether there are conflicts based on the
    Aaron> presence of .THIS .BASE and .OTHER files
    >>  I understand the need of these files...  I understand
    >> less why they should pollute my work dir...

    Aaron> We produce these files for you to use.  Most conflicts
    Aaron> are easily resolved, but some make absolutely no sense
    Aaron> when you look at the output.  The .BASE, .OTHER, and
    Aaron> .THIS files can be used to see which changes were
    Aaron> introduced by each tree, so you can resolve them
    Aaron> yourself. 

Yes I understand that, I was just a little provocative (sp?) :-)

And what  about putting theses  files under .bzr/conflicts  ? Not
really sexy I guess :-/ 

Or .conflicts ? Not really better... 

Ok, whatever,  I am  not completely satisfied,  but I  don't have
better alternatives.

Overall I buy it :)

    Aaron> Alternatively, you can invoke an external tool like
    Aaron> meld on these files to do the merge.

I know, I currently work with dvc under emacs :-)

       Vincent