[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: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-04-28 21:01:35 CEST

solo turn <soloturn99@yahoo.com> writes:

> how would i merge issue-951 into trunk?
>
> $ svn co https://svn.collab.net/repos/svn/trunk
> $ cd trunk
> $ svn merge https://svn.collab.net/repos/svn/branches/issue-951-dev/
> .
> $ svn merge https://svn.collab.net/repos/svn/branches/issue-951-dev/
> .

Merge requires two URLs and a working copy path, in the above commands
the "." argument converts to the trunk URL and the working copy path
defaults to the current directory.

> svn: RA layer request failed
> svn: REPORT request failed on '/repos/svn/branches/issue-951-dev'
> svn: REPORT of '/repos/svn/branches/issue-951-dev': Could not read
> response body: Secure connection truncated (https://svn.collab.net)
>
> this way?
> $ svn merge https://svn.collab.net/repos/svn/branches/issue-951-dev/
> https://svn.collab.net/repos/svn/trunk
>
> or the other way round?
> $ 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.

> or do i additionally specify some revision number, and if yes, where
> do i get the correct one?

You need to get some revision numbers, try

svn log http://svn.collab.net/repos/svn/branches/issue-951-dev

and to merge use something like

svn co http://svn.collab.net/repos/svn/trunk wc
svn merge -r4199:HEAD http://svn.collab.net/repos/svn/branches/issue-951-dev wc

> is it possible, that i cannot revert a change applied by a merge?
>
> $ svn revert www
> $ svn st www
> MM www/cvs-changelog.html
> M www/cvs_help.html
> D www/images
> ...

"svn revert" is non-recursive by default.

-- 
Philip Martin
---------------------------------------------------------------------
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:02:32 2003

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