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

Re: svn merge directory changes and file changes

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-06-14 17:45:03 CEST

On Mon, 2004-06-14 at 03:51, Hardi Gunawan wrote:
> I reckon from subversion docs that svn merge have 2
> options, depending on whether it is supplied with a
> target or not.

Correct.

>
> But if I want to merge changes to a few files, do I
> have to specify them one by one?

Yes.

Either you compare two directories and merge the resulting differences
to a working copy directory, or compare two files and merge resulting
differences into a working copy file.

So if you want to merge N specific files, you must run 'svn merge' on
each file.

In general, though, most people merge whole directories, not individual
files.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jun 14 17:50:28 2004

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

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