[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: Mark Phippard <markp_at_softlanding.com>
Date: 2006-09-18 21:20:31 CEST

allan juul <allan@muly.dk> wrote on 09/18/2006 03:17:29 PM:

> 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:
>
> svn merge -r12345:HEAD
> URL/path/to/A working/copy/path/to/B
>
> i can't do this either since the added files obviously doesn't exist
yet:
>
> svn merge -r12345:HEAD
> URL/path/to/A/newfile Working/copy/path/to/B/newfile
>
> it's only a handful of files so i can just do a --dry-run and then
> select the files manually but can't this be done in a single command?

Can't you just merge everything in the revision range and then use svn
revert on the files that were not added?

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Sep 18 21:21:29 2006

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