Comment 6 for bug 414589

>>>>> John A Meinel <> writes:

    > Vincent Ladeuil wrote:
    >> @Martin: Thanks for the feedback, so indeed, there was a 'bzr add'.
    >>
    >> Marking high as it's a first line of defense against subsequent
    >> surprising behaviors (once the files are added, subsequent conflicts on
    >> the involved files become really obscure).
    >>

    > So one possibility is to add .THIS, .BASE, .OTHER to the default ignore
    > list.

    > The good and bad is that "bzr add" won't default to adding
    > them, but "bzr status" won't default to showing them. (You
    > will hopefully a conflict entry for the given file,
    > though.)

One problem with that approach is that it doesn't make any
difference between a file genuinely named 'MY.BASE' and a bzr
conflict-related-generated file named 'MY.BASE'

What I have in mind instead is to add a check, from the actual,
existing, conflicts that 'MY.BASE' can't be added if 'MY' is in
conflicts. I.e. bzr knows (for a moderately sure value of knows)
that MY.BASE has been generated to help the user resolve a
conflict involving 'MY', in that case, it shouldn't accept
silently (or ever) to 'bzr add' it.

We can discuss how strong bzr will resist add'ing such files
(involved in a conflict) around the lines of: refusing to add
except if the files are specifically provided as parameters.