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

Re: svn commit: rev 2202 - branches/issue-662-dev/subversion/include branches/issue-662-dev/subversion/libsvn_client branches/issue-662-dev/subversion/clients/cmdline branches/issue-662-dev/subversion/tests/clients/cmdline/svntest

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-06-14 16:50:46 CEST

Karl Fogel <kfogel@newton.ch.collab.net> writes:

> Ben Collins-Sussman <sussman@collab.net> writes:
> > > When it's time to merge that work into the trunk, the patch is
> > >
> > > svn diff -r2198:HEAD http://svn.collab.net/.../branches/issue-662-dev
> > >
> > > (I'm too lazy to figure out the `svn merge' command right now).
> >
> > Karl, you make me laugh. If you were to simply s/diff/merge in that
> > example above, you'd have your merge command! (Assuming you were
> > sitting at the top of your normal trunk working copy.)
> >
> > Really, 'svn merge' isn't that hard. :-)
>
> After of all of our discussions about possible merge syntaxes, I had
> simply lost track of what the current syntax actually *is* :-).

Heh, the merge syntax (in optimized form) is almost identical to diff
syntax. (It's really just a special kind of 'svn diff' anyway.) You
helped design the syntax, Karl, so I'm not surprised that it came out
that way.

Since we've decided to not use 'svn rollback', I suggest that people
get familiar with 'svn help merge'. :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 14 16:52:29 2002

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