If you put changes multiple times from trunk to a branch (in development
terms, a re-base) you can cause reflective merges and actually cause more
problems. The recommended merge back into trunk is a reintegrate merge.
I am not sure if this has been addressed in 1.7, but certainly for earlier
versions (anyone please correct me if I am wrong here though :) ).
The scenario goes
1) trunk contains file A
2) copy trunk to branch1
3) modify file A in branch1
4) add folderb/fileb in trunk
5) branch (copy) folderb into branch (or merge if it actually works :) )
6) do some changes to file A and ffileb
7) merge back into trunk.
SVN seems to get confused and when it checks the history of both trunk and
branch1 it doesn't know that the folderb/fileb was added in branch1 using a
copy, therefore it just thinks you added the files on trunk and then
branch1 as two separate operations (for any clearcase users this is an evil
twin scenario). Therefore SVN will create a tree conflict when merging
your branch back into trunk.
A similar scenario occurs of you copied file A from trunk to branch1 after
modifying it on trunk. SVN will then throw content conflicts, telling you
that you modified the same line in the file in two branches (i.e. trunk
and branch1) and the text is identical. Again not sure if 1.7 fixes this,
but it is definitely present in 1.6.x
On 9 December 2011 12:49, Cooke, Mark <mark.cooke_at_siemens.com> wrote:
> > -----Original Message-----
> > From: Rob Pointer [mailto:rpointer_at_clearvision-cm.com]
> > Sent: 09 December 2011 12:45
> > To: Randall Reynolds; Cooke, Mark; users_at_subversion.apache.org
> > Subject: Re: Question
> > I have been looking through this thread and it might be resolved.
> > Can I ask why you are trying to merge from trunk into the
> > branch? The usual operation would be the other way around,
> > otherwise you can run into reflective merge issues.
> Really? My understanding is that most merges are from trunk to branch to
> keep the branch up to date so that when you reintegrate back to trunk you
> hit less issues...
> ~ mark c
> > Rob
*Rob Pointer MSc*
Software Specialist and Consultant
Tel: +44 (0) 845 459 9530
Received on 2011-12-09 14:05:33 CET