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

Re: Patch needed for javahl in release 0.34 - Update

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-11-30 04:14:26 CET

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
Received on Sun Nov 30 04:15:50 2003

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