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

Re: Merging and Additions

From: Ryan Schmidt <subversion-2006q2_at_ryandesign.com>
Date: 2006-05-23 16:50:09 CEST

On May 23, 2006, at 15:55, Michael Pickard wrote:

> I am trying to merge changes from one repository (A) into the
> working directory of another repository (B).
> However, files, added to (A) appear not to be making it to the
> working directory.
> e.g.
> svn merge http://repository/abc/trunk/repa http://repository/abc/
> branches/branchb

That's not how you do that. Your command would make a recipe that
transforms repa into branchb. But doing that in a working copy of
branchb doesn't make sense, therefore nonsensical errors are produced.

You probably want

svn merge -r42:HEAD http://repository/abc/trunk/repa

where 42 is either the revision at which branchb was created from
repa, or the last revision at which you performed the above merging

It looks to me like these are a trunk and a branch in the same
repository. If they're actually different repositories, as you said
above, then 42 is the revision in repa at which you did the last merge.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 23 16:59:51 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.