Repeated merging causing conflicts

[Jo Jo <jo...@hotmail.com>]

I'm trying to perform a merge, and svn is registering all these conflicts 
that seem unnecessary. Part of the problem is that I am trying to merge the 
trunk into a branch--unusual, but I've done it before. Another problem is 
that I've already merged the trunk into this particular branch before, but 
I'm handling the repeated merge issue the way the book recommends.

A call to svn log in the branch project directory shows that the last time I 
did a commit after a merge from the trunk to the branch was rev 214. Since 
then I've made several commits to the trunk, until the head is rev 237. So 
here's an abstraction of what the log shows for the branch across the 
relevant range:

--branch log--
r214: commit following merge from trunk
r217: commit of one irrelevant file
r235: commit before next merge

And that's it. Nothing else since 214 in the branch. So I thought a call to:

cd branch
svn merge -r 215:237 http://URL/trunk

would be the right way to go. Consequently a got a long list of 'U's (which 
I assume were duly merged files), a good number of 'C's for what didn't seem 
to be conflicts at all, and a skipped file due to a "missing target" which 
was never part of the branch, but was created in the trunk (sometime after 
214).

If I look at the log for a number of these conflicting files, they have no 
history in the branch since 214, however, they have been changed in the 
trunk. How can a file that hasn't been changed in a revision range in the 
working copy's branch cause a conflict? Even worse, how can a file that 
never existed in a branch be skipped when merging from the trunk?

_________________________________________________________________
FREE pop-up blocking with the new MSN Toolbar � get it now! 
http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org