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

Merging back to trunk

From: Daniels, Troy \(US SSA\) <troy.daniels_at_baesystems.com>
Date: 2006-06-19 19:12:30 CEST

Hello,

I'm trying to do a more complicated merge than what the examples in the
documentation cover. Here's a summary of the revisions in the
repository.

1 create trunk
2-99 do stuff in trunk
100 create branch
101-149 do stuff in trunk and branch
150 merge trunk to branch (101 to 149)
151-199 do stuff in trunk and branch
200 merge trunk to branch (151-199)
201-249 do stuff in trunk and branch
250 merge trunk to branch (201-249)

Everything in branch is now working, and ready to be merged up to trunk.
I've tried merging 100-250 to trunk, as well as 101-250, since I'm not
certain if I want to merge the revision that created the branch. Either
way, the merge tries to create a lot of files that already exist in
trunk. The only thing I've done with these files in the branch is to
create them when I merged from trunk. The merge at 250 had 3 conflicts;
merging branch to trunk generated at least dozens and maybe hundreds of
conflicts.

I could try merging 100/101-250, but then I lose the changes involved in
the merge from trunk to branch. Since that involved creating a new
file, it seems that future merges will have issues if I don't merge up
250, since the new file will already exist when I try to merge trunk to
branch.

The one option I haven't tried is to merge 101-149, then 151-199, then
201-249 and hope I remember any changes made during the merge. Even
then, I can see that creating problems, as the source in trunk probably
has changed since 150, so merging 101-149 is likely to have a
significant number of conflicts.

Is this style of merging something that can be done in svn? We used to
use clearcase, where it would usually work (except when your merge went
bad and you had to spend (at least) a day trying to resolve all of your
conflicts).

Troy

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jun 19 19:14:38 2006

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