If I modify a file on the trunk and on a branch and at the same time
modify a property of the
file in the same way I get a conflict for the file but not for the
property when I try to merge
the branch. Why don't I get a conflict for the property?
I am using subversion 1.1.1.
$ svnadmin create /tmp/svnrepos
$ svn co file:///tmp/svnrepos workingdir
Checked out revision 0.
$ cd workingdir
$ svn mkdir trunk
A trunk
$ svn mkdir branches
A branches
$ echo > trunk/myFile
$ svn add trunk/myFile
A trunk/myFile
$ svn commit -m 'Initial empty file on trunk'
Adding branches
Adding trunk
Adding trunk/myFile
Transmitting file data .
Committed revision 1.
$ svn copy trunk branches/mybranch
A branches/mybranch
$ svn commit -m 'Created branch mybranch'
Adding branches/mybranch
Committed revision 2.
$ echo 'Change on trunk' > trunk/myFile
$ svn propset myprop 'Change on trunk' trunk/myFile
property 'myprop' set on 'trunk/myFile'
$ svn commit -m 'Changed myFile and its property on trunk'
Sending trunk/myFile
Transmitting file data .
Committed revision 3.
$ echo 'Change on branches/mybranch' > branches/mybranch/myFile
$ svn propset myprop 'Change on branches/mybranch' branches/mybranch/myFile
property 'myprop' set on 'branches/mybranch/myFile'
$ svn commit -m 'Changed myFile and its property on branches/mybranch'
Sending branches/mybranch/myFile
Transmitting file data .
Committed revision 4.
$ svn merge -r2:HEAD branches/mybranch trunk
CU trunk/myFile # Why not CC?
$ cat trunk/myFile
<<<<<<< .working
Change on trunk
=======
Change on branches/mybranch
>>>>>>> .merge-right.r4
$ svn propget myprop trunk/myFile
Change on branches/mybranch # The merge has overwritten the property
on the trunk!
/ Andreas
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 11 17:39:34 2005