Problem with Branching/Merging, patches to the Trunk
From: Thomas Sturgeon <thomas.sturgeon_at_kineticsusa.com>
Date: 2005-03-09 23:49:11 CET
I have created a directory with the following structure:
Into the Trunk directory, I placed a pristine copy of the source code
After importing the Trunk dir and committing, I did an 'svn copy' to
I then proceeded to extensively modify branches/mybranch
Eventually, patches came out for the Trunk and I applied those patches
At some point, I want to merge the changes caused by the patches to the
I have tried 'svn merge' with the FROM and TO with either path, but
I have read the manual, so I am confused as to how to handle
If someone has an example of a set of steps to create a mock project and
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.
This is an archived mail posted to the Subversion Users mailing list.