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

Question about merging

From: Conner, Shawn <SConner_at_abacus-us.com>
Date: 2005-10-25 18:44:14 CEST

We recently migrated from SCCS to subversion, and so far love
everything. We have come across a minor issue, and was wondering if
there was a way around this. Basically we have a bunch of applications
that reside in the trunk, which are dependent on each other(it was a
poor design that happened before I was around).
Anyways at any given time we could have several development efforts in
parrelell happening in different branches which all effect each other,
but are going out at different times. The issue comes up when we merge
changes from one branch into the trunk and want to merge those changes
from the trunk into another branch, to make sure the changes don't have
a negative impact on other development efforts. There is no issue with
the merge from the branch into the trunk, and then into another branch.
The issue comes up when we try to merge the second branch back into the
trunk. If we use the revision where we did the merge from the trunk
into the branch, we don't get all the changes. If we use the revision
where the branch was created, all the changes that we merged in from the
trunk show up as conflicts.
Is there a better way to do this?
Shawn Conner
Received on Tue Oct 25 21:24:35 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.