You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by allan juul <al...@muly.dk> on 2006/09/18 19:17:29 UTC
"merging" add files
hi
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?
./allan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: "merging" add files
Posted by Ivan Aleman <bo...@gmail.com>.
> 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
Re: "merging" add files
Posted by Mark Phippard <ma...@softlanding.com>.
allan juul <al...@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