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

Re: Merge problem after changing directory tree structure

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-03-27 16:30:17 CET

Derek Mahar wrote:

> How do I now merge the changes to b/branches/branch1 in revision 3 to
> b/trunk so that I get b/trunk/a.txt? If I specify b/branches/branch1 at
> revision 3 as the merge source revision, Subversion complains that
> b/branches/branch1 does not exist in revision 3. Is there a workaround
> to this problem?

Sure: don't compare repository roots. Compare subtrees instead.

In your case, assuming you have a working copy of /b/trunk in local
directory "wc", you'd run

     svn merge -r2:3 schema://.../a/branches/branch1 wc

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Mar 27 16:31:52 2004

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