[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

More strange merge conflicts.

From: David Summers <david_at_summersoft.fay.ar.us>
Date: 2005-07-29 22:35:39 CEST

Hello Subversionistas,

   I've copied trunk to a branch, worked on the branch off and on for
several months. Periodically, I'll merge the changes from the trunk to
the branch to keep it up-2-date. It worked fine for several times in a
row over the course of a month or so.

The last two times I've tried to merge the trunk to the branch, I've
gotten several conflicts.

I don't understand those conflicts because nothing has changed on the
branch in those directories. They have to do with directories that I'm
not even working with on the branch.

It happened the first time a couple of months ago when I hadn't done
anything on the branch for a few weeks.

While on the branch I did a "svn merge -rLAST_WEEKLY_MERGE+1:HEAD
URL_OF_TRUNK".

I keep track of the merge revisions in the log message.

I got several conflicts. Last time the non-trivial conflict I got I just
copied from trunk and committed to resolve it.

I did it again today because now we are finally getting ready to merge in
the feature branch back into trunk and I got several more conflicts again.
Again most of them were trivial (white-space?) conflicts (but again I
don't understand why the conflict because nothing changed on the branch in
those directories).

However, the last conflict, it appears that changes made on the trunk are
not being brought over to the branch.

The trunk compiles cleanly, the branch compiles cleanly before the merge.
However, after the merge, it shows conflicts. It also does NOT compile
cleanly (even after trying to resolve the conflicts) and it appears that
the conflicts are where stuff is missing in the resulting merged file from
changes that were made in trunk that now should be there in the branch
from the merge from trunk.

(I hope I said all that correctly).

Any ideas as to what I'm doing wrong?

The merge was done with subversion 1.1.4 the first time and
subversion 1.2.1 today.

Am I mis-understanding some concept of branching/merging?

Thanks!

--
David Wayne Summers        "Linux: Because reboots are for hardware upgrades!"
david_at_summersoft.fay.ar.us PGP Key: http://summersoft.fay.ar.us/~david/pgp.txt
PGP Key fingerprint =  0B44 B118 85CC F4EC 7021  1ED4 1516 5B78 E320 2001
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 29 22:37:45 2005

This is an archived mail posted to the Subversion Users mailing list.