Merging and Additions

[Michael Pickard <mp...@visitlondon.com>]

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

 

results in

 

Skipped missing target:
'abc/servlet/src/com/somedomain/servlet/customer/SomeServlet.java'

 

Am I missing something, or do new files added to (A) need to be manually
added to the working directory each time ?

 

TIA,

Michael 
  
Michael Pickard 
Software Engineer 
Visit London 
6th Floor,
2 More London Riverside, London, SE1 2RR 
  
Tel:  +44 (0)20 7234 5857 
Fax: +44 (0)20 7234 5751 
www.visitlondon.com  
  
Visit London is the official visitor organisation for London. Visit London is partly funded by Partnership, the Mayor's London Development Agency and the Association of London Government. 
The information contained in this e-mail is confidential and intended for the named recipient(s) only.  If you have received it in error, please notify the sender immediately and then delete the message.  If you are not the intended recipient, you must not use, disclose, copy or distribute this email. The views expressed in this e-mail are those of the individual and not of Visit London. We reserve the right to read and monitor any email or attachment entering or leaving our systems without prior notice. 
 

Re: Merging and Additions

[Ryan Schmidt <su...@ryandesign.com>]

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  
procedure.


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

Re: Merging and Additions

[Garrett Rooney <ro...@electricjellyfish.net>]

On 5/23/06, Michael Pickard <mp...@visitlondon.com> 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.

Correct, because 'svn merge' has never been documented to work with
two separate repositories.  It just doesn't work.  In newer versions
of svn it'll error out loudly if you try.  In older versions it'll
sometimes kinda sorta work, and sometimes you get this kind of error.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org