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

Re: How to svn merge without skipped targets?

From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Wed, 5 Aug 2009 07:21:40 -0700

On Wed, Aug 05, 2009 at 09:39:20AM +0200, KYLEE_at_bksv.com wrote:
> I want to merge a folder from a different repository.

Careful with your terminology. You can't merge from a different
repository. It looks like you're trying to merge from one project
(top-level dir underneath a repo) to another.

> The merge source is like:
> \Suites\xxxx
> \Suites\yyyy
> The merge destination is like:
> \Suites\zzzz
> I want to achieve this outcome:
> \Suites\xxxx
> \Suites\yyyy
> \Suites\zzzz
> The command line i use is:
> c:\Builds\Source\Applications\ApplicationsTest>svn merge --dry-run
> --accept mine-full -r 95976:HEAD http://svn/test <http://svn/test>
> /trunk/Applications/ApplicationsTest_at_HEAD
> <mailto:vn/Reflex/trunk/Applications/ApplicationsTest_at_HEAD> .
> ( where HEAD revision is ~15000 )
> ( where revision 95976 is the initial creation of \Suites\xxxx and
> \Suites\yyyy )
> But i kept getting this kinda merge:
> Skipped 'Suites\xxxx\aaaaa
> Skipped 'Suites\xxxx\aaaaa\Log'
> Skipped missing target: 'Suites\xxxx\aaaaa\qqqqq.cpp

Does it work if you go back one revision to 95975?

Does it work if you do the merge for real instead of with --dry-run?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-05 16:22:31 CEST

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.