I'm doing a merge that I thought would be straightfoward, but it gave me
a huge number of conflicts, and I'm trying to understand why. Here's the
situation: all of the recent work on this project was done on a branch,
and trunk hasn't been touched. Now we want to move the mainline
development back to trunk and go back to the usual use of branches (just
for releases and disruptive changes).
The last commit to trunk was r1003. The branch was made at r7232 (based
on "svn log --stop-on-copy") and worked on up to r12212 (the current
head revision), then frozen. I checked out a clean working copy of trunk
at r12212. From within the clean trunk working copy I did this command:
svn merge -r 7232:12212 $REPOS/branch
Since there were no commits to trunk between r7232 and r12212, there
were no merges in either direction between trunk and branch (since there
were no trunk changes there's nothing to merge to the branch, and if
there were any previous branch to trunk merges they would show up in the
log for trunk). So there should be no conflicts, right?
But I have 75 conflicted files. 15 of these are in a directory that
hasn't been touched since r7232 ("svn diff -r 7232:12212 directory"
gives no output). The files haven't been modified in the trunk or in the
branch, so how can they be conflicted?
When I look at the conflicted files, all of them have a *.merge-left.r0
file that is empty. Why does it say r0 instead of r7232? The merge-right
files all say .r12212, and seem to contain the contents I want. The
*.working files contain the old contents of trunk.
I'm assuming I must have specified the merge command wrong, but I don't
see what's wrong with it. I've been using svn for a number of years, but
I haven't done that many merges. I've double checked all the revision
numbers, made sure my working copies were clean and up to date, and
double checked with "svn diff" that there were no trunk changes. Can
someone point out my mistake?
All opinions expressed here are mine, and do not necessarily represent
those of my employer.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-21 23:24:26 CEST