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

Re: Could merging be any more cumbersome?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-08-05 14:53:58 CEST

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
Received on Fri Aug 5 14:55:45 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.