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

Re: svn merge: how to

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-05-02 14:14:16 CEST

Hans Marggraff <hmf@qint.de> writes:

> Hi,
>
> can anyone explain the purpose and proper use of the first form of
> the merge command. I tried it in various configuration, but was too
> dumb to get any effect.

The main idea is that 'svn merge' is nearly identical to 'svn diff':
it needs two sources to compare. Instead of showing diffs to the
screen, it applies them to a working-copy target.

So, like 'svn diff', there are two different ways to specify two
sources:

   svn merge http://host/.../foo@X http://host/...bar@Y
   svn merge -r X:Y http://host/.../foo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 2 14:16:05 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.