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

Problem with Branching/Merging, patches to the Trunk

From: Thomas Sturgeon <thomas.sturgeon_at_kineticsusa.com>
Date: 2005-03-09 23:49:11 CET

Greetings.

 

I have created a directory with the following structure:

Branches

Tags

Trunk

 

Into the Trunk directory, I placed a pristine copy of the source code
for my project.

 

After importing the Trunk dir and committing, I did an 'svn copy' to
copy the contents of the Trunk to branches/mybranch

 

I then proceeded to extensively modify branches/mybranch

 

Eventually, patches came out for the Trunk and I applied those patches
to the Trunk.

 

At some point, I want to merge the changes caused by the patches to the
Trunk back into mybranch.

 

I have tried 'svn merge' with the FROM and TO with either path, but
changes I know I made never seem to get integrated.

 

I have read the manual, so I am confused as to how to handle
branching/merging.

 

If someone has an example of a set of steps to create a mock project and
walk through it so that one can understand all the combinations and
permutations, that would be nice.

 

Thanks,

Tom

This electronic transmission is strictly confidential and intended solely for the addressee. It may contain information that is covered by legal, professional, or other privilege. If you are not the intended addressee, you must not disclose, copy or take any action in reliance of this transmission. If you have received this transmission in error, please notify the sender as soon as possible.
Received on Thu Mar 10 01:56:52 2005

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