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

Merging Properties?

From: Brian Neal <bgneal_at_gmail.com>
Date: Thu, 9 Jun 2011 19:58:12 -0500


Suppose I have a file on trunk called file.txt. I put a property on
it, say color with the value red.
Now I copy trunk to a branch B.
On branch B I change file.txt's color property to green.
Now independently on trunk, I also change file.txt's color property to green.
When I merge the branch B back to trunk, I get a merge conflict, even
though both the branch and the trunk are trying to change the property
to the same value.

Is this expected or a bug or ...?

I'm using TortoiseSVN 1.6.15 on Windows which I think is using
Subversion 1.6.16.


Received on 2011-06-10 02:58:46 CEST

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

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