Re: 'conflicts' which are textually equal

On Thu, Jul 23, 2009 at 11:49:26AM +0100, James French wrote:
> Hi,
>
> I was just wondering why svn isn't smart enough to resolve conflicts
> when the resultant text is exactly the same. For example:
>
> <<<<<<< .working
> AttribDataUpdatePlaybackPos *attrMyUpdateTimePosOut = parameters->createOutputAttribReplace<AttribDataUpdatePlaybackPos>(7, ATTRIB_SEMANTIC_UPDATE_TIME_POS);
>
> =======
> AttribDataUpdatePlaybackPos *attrMyUpdateTimePosOut = parameters->createOutputAttribReplace<AttribDataUpdatePlaybackPos>(7, ATTRIB_SEMANTIC_UPDATE_TIME_POS);
>
> >>>>>>> .merge-right.r56375
>
> I come across this a lot.

Are you using trunk?

We've noticed this in trunk code recently but so far no one has
investigated: http://svn.haxx.se/dev/archive-2009-07/0237.shtml

> Surely a simpler strcmp() would suffice?

Sure, I'll apply this patch right now and test it, thanks ;)

Stefan
Received on 2009-07-23 13:16:09 CEST