Problem with Branching/Merging, patches to the Trunk

[Thomas Sturgeon <th...@kineticsusa.com>]

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.

Re: Problem with Branching/Merging, patches to the Trunk

[Ben Collins-Sussman <su...@collab.net>]

On Mar 9, 2005, at 4:49 PM, Thomas Sturgeon wrote:
>
> I have tried ‘svn merge’ with the FROM and TO with either path, but 
> changes I know I made never seem to get integrated.

Here's your confusion:  the merge command doesn't take FROM and TO 
arguments.  It's nothing at all like a copy command.

There are three arguments to merge:

   1. a left-side tree to compare
   2. a right-side tree to compare
   3. a working copy to patch

The merge command compares the left and right trees, and applies the 
resulting "diff" to the working copy.  The result is exactly the same 
as if you had replicated the changes in the working copy by manually 
editing every file.  (You have to 'commit' the changes to make them 
permanent.)

Chapter 4 in the book (I think) explains this idea over and over, so if 
you can give specific feedback as to why you missed this concept, or 
why you got the idea of FROM->TO, it would help us improve the 
documentation.

Also, if you need more specific help, then you'll have to mail back 
very specific questions.  You'll need to show exact transcripts of the 
commands you've typed, the output that resulted, and exactly where 
you're getting stuck.


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