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

RE: Help with merging please

From: Bob Archer <bob.archer_at_amsi.com>
Date: Wed, 4 Nov 2009 11:10:21 -0500

> I am a svn newbie, but did lots of merging/collapsing in clearcase
> and cvs. I am trying to collapse a dev branch back into the parent
> using the --reintegrate option to merge. I have a brand new
> sandbox in which I also ran svn update.
> I then ran the merge --reintegrate command and I get "Cannot
> reintegrate into a working copy not entirely at infinite depth".
> Can someone advise me about what this means and how to get this
> merge to work please?

Update your working copy so that it isn't a sparse checkout..

svn up --set-depth infinity

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2414442

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-04 17:11:40 CET

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.