You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Jostein Chr. Andersen" <jo...@josander.net> on 2003/11/29 16:02:32 UTC
Re: Patch needed for javahl in release 0.34 - Update
Ok folks!
You have convinced me and showed me the light :-)
The arguments for adding the java stuff (and other qualified changes) are
so strong and good so I might be happend to understand when to merge
next time!
Ok? ..Fine! Then I need some help from you:
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
?
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'
Thanks
Jostein
--
http://www.josander.net/kontakt/ ||
http://www.josander.net/en/contact/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Single changes from trunk to branch (was: Re: Patch needed for javahl in release 0.34 - Update)
Posted by Erik Huelsmann <e....@gmx.net>.
> 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
Re: Patch needed for javahl in release 0.34 - Update
Posted by "Jostein Chr. Andersen" <jo...@josander.net>.
On Sunday 30 November 2003 13.57, Patrick Mayweg wrote:
> Hi Jostein,
> thanks for adding that to the branch.
> Patrick
My pleasure :-)
--
http://www.josander.net/kontakt/ ||
http://www.josander.net/en/contact/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Patch needed for javahl in release 0.34 - Update
Posted by Patrick Mayweg <ma...@qint.de>.
Hi Jostein,
thanks for adding that to the branch.
Patrick
Jostein Chr. Andersen wrote:
>So today, I committed changes for CHANGES and svn_version.h to the trunk
>with r7882.
> If both files turns be ok then:
> $ cd 0.34-branch-wc/
> $ svn merge -r7881:7882 http://svn.collab.net/repos/svn/trunk
> ?
>
>Finally, I got it (and I _do_ understand after playing around in my own
>projects). Sometimes, things are just to simple and this was "another
>way of thinking" for me. Hmm, maybe I'm getting old..
>
>Thanks
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Patch needed for javahl in release 0.34 - Update
Posted by "Jostein Chr. Andersen" <jo...@josander.net>.
On Sunday 30 November 2003 04.14, Ben Collins-Sussman wrote:
> Jostein, you seem to get confused about how to do merging every time
> it comes up. Think of it this way: how would you see Patrick's patch
> if you wanted to examine it? You'd simply diff r7867:7868 of the
> trunk, right? That's what the commit-mailer program does after every
> commit: it compares two consecutive trees.
>
> So, think of 'svn merge' as the cousin of 'svn diff'. Both tools use
> the exact same syntax to define a patch.
>
> $ svn diff -r7867:7868 http://svn.collab.net/repos/svn/trunk
>
> ...will show Patrick's changes in your terminal, so
>
> $ cd 0.34-branch-wc/
> $ svn merge -r7867:7868 http://svn.collab.net/repos/svn/trunk
>
> ...will merge that exact same change into your branch working-copy.
So today, I committed changes for CHANGES and svn_version.h to the trunk
with r7882.
If both files turns be ok then:
$ cd 0.34-branch-wc/
$ svn merge -r7881:7882 http://svn.collab.net/repos/svn/trunk
?
Finally, I got it (and I _do_ understand after playing around in my own
projects). Sometimes, things are just to simple and this was "another
way of thinking" for me. Hmm, maybe I'm getting old..
Thanks
--
http://www.josander.net/kontakt/ ||
http://www.josander.net/en/contact/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Patch needed for javahl in release 0.34 - Update
Posted by Ben Collins-Sussman <su...@collab.net>.
On Sat, 2003-11-29 at 10:02, Jostein Chr. Andersen wrote:
> svn merge -r 7859:7868 http://svn.collab.net/repos/svn/trunk/subversion/
> bindings/java/javahl/native
>
> ?
>
> 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'
Jostein, you seem to get confused about how to do merging every time it
comes up. Think of it this way: how would you see Patrick's patch if
you wanted to examine it? You'd simply diff r7867:7868 of the trunk,
right? That's what the commit-mailer program does after every commit:
it compares two consecutive trees.
So, think of 'svn merge' as the cousin of 'svn diff'. Both tools use
the exact same syntax to define a patch.
$ svn diff -r7867:7868 http://svn.collab.net/repos/svn/trunk
...will show Patrick's changes in your terminal, so
$ cd 0.34-branch-wc/
$ svn merge -r7867:7868 http://svn.collab.net/repos/svn/trunk
...will merge that exact same change into your branch working-copy.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org