Thank-you! Thank-you!!! This worked!
---------------------
Regards;
Marlene Cote
10 Technology Park Drive
Westford, MA 01886
Phone #:1-978-589-0612
Fax #:1-978-589-0064
"Excellence, can be attained if you...
Care more than others think is wise....
Risk more than others think is safe....
Dream more than others think is practical....
Expect more than others think is possible."
-----Original Message-----
From: Bob Archer [mailto:Bob.Archer_at_amsi.com]
Sent: Wednesday, November 04, 2009 11:10 AM
To: Marlene Cote; users_at_subversion.tigris.org
Subject: RE: Help with merging please
> 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=2414450
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-04 17:36:27 CET