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

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

From: Thomas Sturgeon <thomas.sturgeon_at_kineticsusa.com>
Date: 2005-03-10 16:28:11 CET

Greetings.

I apologize for mixing projects. I had assumed that the Tortoise SVN
client was simply a graphical shell for the underlying SVN commands. In
the GUI, FROM and TO are used, and there is no indication that the
results will be funneled to the working directory.

Even so, I still did not have a conceptual handle on merging.

These two paragraphs are pure gold, and is all I needed to understand
what was going on:
"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.)"

Thanks,
Tom Sturgeon

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: Thursday, March 10, 2005 9:25 AM
To: Thomas Sturgeon
Cc: users@subversion.tigris.org
Subject: Re: Problem with Branching/Merging, patches to the Trunk

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.

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.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 10 16:30:06 2005

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