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

Single changes from trunk to branch (was: Re: Patch needed for javahl in release 0.34 - Update)

From: Erik Huelsmann <e.huelsmann_at_gmx.net>
Date: 2003-11-29 19:44:28 CET

> You have convinced me and showed me the light :-)
Great!
 
[ snip ]
> On Saturday 29 November 2003 09.18, Patrick Mayweg wrote:
> > could you add the revision 7868 for javahl to the 0.34 branch,so that
> > the javahl binding will be compilable in the release ?

> Is this the command I should use for merging 7868 into the 0.34.0 branch
> (word wrap warning):
> $ svn merge -r 7859:7868 http://svn.collab.net/repos/svn/trunk/subversion/
> bindings/java/javahl/native
> ?
With this command you merge *all* changes between r7859 and r7868 to your
working copy.

> Have I understood it right? 7859 are the branch point and 7868 are
> Patrick's commit. And I'm running this command from within my wc (no,
> not the toilet :-) made of 'co http://svn.collab.net/repos/svn/
> branches/0.34.0'

If you want the changes from Patricks commit to be merged to your working
copy you would (same word wrap warning applies):

 $ svn merge -r 7867:7868 http://svn.collab.net/repos/svn/trunk/subversion/
 bindings/java/javahl/native

That way, you merge the changes added by r7868 to your working copy. I think
this is the command you want to use, since it is the one to pick only
Patricks changes from the trunk to your branch.

> Thanks
> Jostein

HTH.

Erik.

-- 
Neu bei GMX: Preissenkung für MMS-Versand und FreeMMS!
Ideal für alle, die gerne MMS verschicken:
25 FreeMMS/Monat mit GMX TopMail.
http://www.gmx.net/de/cgi/produktemail
+++ GMX - die erste Adresse für Mail, Message, More! +++
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Nov 29 19:45:07 2003

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