[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Question about bite-sized issue 1493

From: Keegan Dunn <keegandunn_at_gmail.com>
Date: 2007-10-25 02:58:39 CEST

Hey folks. I'm nervously attempting to dive into fixing the bite-sized
issue 1493. I want to make sure I understand the problem here.

As I understand it from looking at the issue tracker, when a multiline
property is altered, the diff will display the change in an unhelpful
way (a minus followed by the old contents, and a plus followed by the
new contents -- nothing granular). This would be fixed by using
utilizing libsvn_diff instead of the present approach. Assuming I
have that right, I don't understand the last post on this issue, where
Erik says:

"Note that the *only* situation which needs changing is the one where
the content changed
locally and new content is received from the server.

Any other situation (locally added, locally deleted, etc) is a structure
conflict, not a content change which could benefit from merging."

In my poking around at this so far, this problem seems to manifest
itself even when it's a local modification. Could someone clarify
what is meant by the local change scenario being a "structure
conflict," and also kick me in the right direction if I'm totally off
course getting started on this?


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 25 02:58:49 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.