RE: Re: Could merging be any more cumbersome?

You could use svnmerge (http://www.dellroad.org/svnmerge/index) for the
time being (until merge tracking of some sort is implemented). It will
take care of most of the "keeping track of revisions"-type stuff.

Cheers
Rob

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: Friday, August 05, 2005 8:54 AM
To: Rick Mann
Cc: users@subversion.tigris.org
Subject: Re: Could merging be any more cumbersome?

On Aug 4, 2005, at 9:29 PM, Rick Mann wrote:

>
> I see that test was added in r11586, so:
>

You do? Where do you see that? Running 'svn log -v' would actually
show you the list of changed paths in each revision. I think r11586
doesn't add test/, but rather adds test/config/. That's why you
only see test/config/ being added.

>
> Now, I know the manual says most newcomers want to merge from one
> branch to another, but that that's the wrong way to think about it.

Where does the book say that's the "wrong way" to think about it?

> I say: it is the RIGHT way to think about it. svn merge should be
> as easy to use as:
>
> $ cd Source
> $ ls
> relaunch/ trunk/
> $ svn merge relaunch/db trunk/db

Congrats, you've just described merge-tracking. You're preaching to
the choir. :-)

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

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 5 15:12:18 2005