Re: Question about bite-sized issue 1493

"Keegan Dunn" <keegandunn@gmail.com> writes:
> 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?

What Erik means by "structure conflict" is a scenario like this:

   1. You add the svn:ignore property locally to file F, with value V1

   2. At the same time, someone commits a change which adds the
      svn:ignore property to F in the repository, with value V2.

   3. You update F.

Technically, there is a diff between the two properties. It might
even be a minimal sort of diff (not just a bunch of "-" followed by a
bunch of "+"), assuming you and the other party used very similar
values. But it's not as if you actually edited a common ancestor of
V1 and V2 to achieve that result. You never had a common ancestor "in
your hand", so to speak. Those kinds of situations shouldn't be
merged, they should just be treated as conflicts.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 25 03:36:54 2007