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

Re: "merging" add files

From: Ivan Aleman <bonovoxmofo_at_gmail.com>
Date: 2006-09-18 22:38:23 CEST

> i have a directory A which was branched at one point to B
>
> i now want to have certain differences applied to B - in fact i only
> wish added files from A applied to B.
>
> this would be easy if i could run svn merge on the whole directory but
> since i'm only interested in the added files i cannot do this:
>

Try the following,

On the B branch

$ svn merge -r 12345:HEAD http://server/svn/A/trunk

where 12345 is the revision in which B was created (copied from A),
this should merge the files and / or add them if they don't exist.

At the root of the working copy

$ svn st

You can try first with svn diff, the use svn merge

-- 
Iván Alemán ~ [[ Debian (Sid) ]] ~
-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
G!>GCM d+ s: a? C+++ UL++ P L+>+++$ E--- W++>+ N* o--- K- w O- M+ V--
PS++ PE-- Y PGP+>++ t-- 5 X R+ !tv b++ DI-- D+++ G+ e++ h* r+ z*>*$
------END GEEK CODE BLOCK------
bonovoxmofo.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Sep 18 22:39:06 2006

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