Conflict handling

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Vincent LADEUIL wrote:
>>>>>>"Aaron" == Aaron Bentley <aaron.bentley at utoronto.ca> writes:
>     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) ?

If we assume the other format changes, then the file would be
.bzr/checkout/conflicts, so that anything that has a working tree would
have it.

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

The issue is that we don't want users to routinely go into '.bzr'.  It's
supposed to be off-limits, except to bzr itself.

> Or .conflicts ? Not really better... 

Yeah, I don't think it would be very intuitive, if you were looking for
the files.  On the other hand, I suppose we could have

$ bzr merge --no-dump-conflicts
and then also have
$ bzr dump-conflicts $FILENAME
to produce the conflicts (from .conflicts or .bzr/checkout/conflicts) if
you decide you want them.

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

That's pretty much where I stand, too.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD8J2m0F+nu1YWqI0RAjTPAJsGedk2gP+yIstMM96j5jodjh07mQCcCcG6
G50mVDDGa96n0OqSsarUPmk=
=8y3S
-----END PGP SIGNATURE-----