'conflicts' which are textually equal

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. Surely a simpler strcmp() would suffice?

James

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2374727

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-07-23 12:50:28 CEST