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

Merging 2 branches

From: Lakshman Srilakshmanan <lakshman.srilakshmanan_at_tradingpost.com.au>
Date: 2006-05-05 08:40:03 CEST

Hi All,

I have the following structure

/branch/project_A branched from trunk at 17
/branch/project_B branched from trunk at 49


The team merges from trunk into their respective branch on a regular
basis. Now the plan has changed and we want to merge both the project
together and release them as Project B.

When I tried to merge project_A (r18:655) into project_B I get an error
"skipped bla bla". Investigation revealed that the files skipped were
deleted in trunk. These changes have obviously been merged into the
respective branches.

Is there a work-around to this problem or am I doing something wrong.

Merging project_A into trunk and then merging trunk into project_B is
not an option because trunk mirrors production and merging project_A
will pollute trunk.

Any thoughts suggestion is greatly appreciated and welcome.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri May 5 08:43:45 2006

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.