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

Re: correct svn merge

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-04-28 21:32:59 CEST

Philip Martin <philip@codematters.co.uk> writes:

> > $ svn merge https://svn.collab.net/repos/svn/trunk
> > https://svn.collab.net/repos/svn/branches/issue-951-dev/
>
> None of the above. To merge you need to provide two URLs that define
> the limits of the change to be merged, neither of those is the trunk
> URL. I would suggest using the "svn merge -rREV1:REV2 URL WC" form of
> the command.

Yeah, come to think of it, this has become a *really* common
misunderstanding among new svn users. People always think a merge
involves diffing the branch and the trunk. The book really needs to
prevent this misconception. :-(

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 28 21:34:51 2003

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