subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Brian Neal <bgn...@gmail.com>
Subject Merging Properties?
Date Fri, 10 Jun 2011 00:58:12 GMT
Hello,

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.

Thanks.

BN

Mime
View raw message