RE: Merging 2 branches

Hi All,

May be neither of the options stated previously are correct.

I believe the following after Reading [1]
http://svn.haxx.se/users/archive-2006-01/0149.shtml from Ryan Schmidt.

Current dir is Project_B

svn merge svn://..../trunk svn://..../branches/project_A

The above states identify the steps required to make Trunk same as
project_A and apply these steps into project_B. This would effectively
merge project_A into project_B.

Am I right in my approach above, Please advice.

Thanks
Lakshman

-----Original Message-----
From: Lakshman Srilakshmanan
Sent: Monday, 8 May 2006 9:48 AM
To: users@subversion.tigris.org
Subject: RE: Merging 2 branches

Hi All,

Could someone please confirm the following.

For my problem below should I do the following command.

Current dir is Project_B

svn merge svn://..../branches/project_A svn://..../branches/project_B

Currently I was doing
Current dir is Project_B

svn merge -r 18:655 svn://..../branches/project_A

Thanks
Lakshman

-----Original Message-----
From: Lakshman Srilakshmanan
Sent: Friday, 5 May 2006 4:40 PM
To: users@subversion.tigris.org
Subject: Merging 2 branches

Hi All,

I have the following structure

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

/trunk

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.

Thanks
Lakshman

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 8 02:41:32 2006