Odd merge conflicts

I was recently experimenting with working on new features in a branch.
I tried to keep my branch up to date by periodically merging changes
from the trunk into my branch. It did not go well.

I made a branch, added a new file to the branch and put some
experimental code in that new file. I merged changes from the trunk
using:

(all of the svn commands below were executed in the root of the
branch's working copy.)

svn merge -rA:B svn://blah/trunk

where A: is the revision in which my branch was created, and B is the
same revision as the current HEAD

That worked fine, and I checked in the branch with the new changes and
updated the working copy.

Then after many more changes on the trunk, and NO changes on the
branch, I tried again with:

svn -rB:HEAD svn://blah/trunk

Where B is the same revision as B in the previous merge.

This resulted in numerous conflicted files. The thing is those files
were never modified in the working copy, so why would they be
conflicted? whatever changes were made in the trunk should have neatly
applied, but instead it seems that the entire file was considered
conflicted.

Now one of the changes to the files on the trunk included adding the
svn:eol-style property to all the files. Does the addition of the
svn:eol-style property in the trunk mess up the merge?

Scott

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jan 2 05:14:08 2005