A conflict is detected when merging a "binary" file which uses keywords.
This conflict is manufactured by SVN, and does not really exist:
This may or may not be another encarnation of the same bug I found a
while back (whose details elude my memory at the moment, but whose
more-convoluted demonstration script I still seem to have here:
At the time, I didnt submit it to the tracker because I couldnt get
anyone else to agree it was actually a bug. Hoping to have better luck
The original (makeconflict) was an extreme edge-case, if I'm remembering
correctly: I think it was only happening when changing one keyword into
another. This new one (t.sh) has just hit me on some very old keywords,
however. (The same ones I previously altered, actually ;))
It is my belief, though not knowing the code I can't say with certainty,
that both of these are a result of the same problem of not un-expanding
keywords before calculating merges/potentialConflicts
In the first case (again, memory is ellusive, so I'm not sure if I'm
remembering correctly), keywords were being unexpanded, but only based
on the /new/ property. In this new case ("binary"), keywords seem to
simply not be un-expanded.
Note that the new case's conflict does NOT appear when doing an update,
only when doing a merge.
On a maybe-unrelated note, darix was trying to convince me that "svn
merge -rBASE:something ."(on a fresh copy) was capable of legitimately
causing conflicts, but unfortunately he ran off before I could
understand him. If anyone can clear this up for me, I'd love to
understand that. I really don't see how "apply the diff between x and y
to x" could possibly be conflicting (I mean, wouldnt that mean x was
different from itself?) Makes me think I am lacking some more
fundamental knowledge of what merge is actually doing.
Again, that's barely-related, so I'd much prefer a response to the first
part of this message :)
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Fri Feb 10 17:25:34 2006