[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: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: 2005-03-10 20:25:03 CET

On Thu, 10 Mar 2005 09:38:15 -0600, Ben Collins-Sussman
<sussman@collab.net> wrote:
> >
> >> ... 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.
> >>
> >
> > I suspect some of the confusion may come from the way the TortoiseSVN
> > merge dialogue is set up. It uses the From/To syntax.
>
> The confusion here is that TortoiseSVN dialog box asks for two URLs,
> labeled "From" and "To". But they're actually asking for "Left Tree"
> and "Right Tree" to compare. The destination of the comparison is
> always the working copy.
>

The TortoiseSVN merge dialog has been a source of confusion for some
of us too. Even when they knew that they need a working copy as the
destination of the merge, the usase of "FROM" and "TO" always meant
that they mixed up the URLs. They would try to merge changes "from" a
tree "to" a tree. So the "FROM" portion would be the tree where the
changes are already present and "TO" would be where you want the
change to be, which is wrong (unless one wants to undo changes). This
usage is a little confusing.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 10 20:27:29 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.