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
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),
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.orgReceived on Mon Sep 18 22:39:06 2006 |
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.