[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: Jostein Chr. Andersen <jostein_at_josander.net>
Date: 2003-11-30 10:17:43 CET

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..


http://www.josander.net/kontakt/ ||
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Nov 30 10:21:02 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.