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

Re: Merging problems

From: haveaguess <ben.ritchie_at_rbs.com>
Date: Thu, 5 Nov 2009 08:21:15 -0800 (PST)

Wow, thanks that's great info.

How did u figure that out ?!

Thanks anyway..

Stefan Küng wrote:
>
> Nick Gilbert wrote:
>> Hans-Emil Skogh wrote:
>>> You should use "Reintegrate a branch" in the situation you describe.
>>> You just have to fix the problems that prevent your merge (and these
>>> may be mutiple). And DO NOT FORGET to delete the entire branch after
>>> you are don reintegrating it.
>>>
>>> It looks like some parts of your working copy have gone missing, or
>>> that you have manually made a sparse checkout. (See
>>> http://svnbook.red-bean.com/en/1.5/svn.advanced.sparsedirs.html for
>>> details.)
>>> Try doing an update on your entire working copy. If that fails to
>>> resolve your problem do an "Update to revision" on the working copy
>>> and set "Update depth" to "Fully recursive". (I'm not sure when this
>>> functionality was introduced, but it's avaliable in the latest
>>> nightly, and I think in the latest official release as well.)
>> Whatever I do I still get "Error: Cannot reintegrate into a working copy
>> not entirely at infinite depth". I don't think any parts of my working
>> copy have gone missing - it's a full checkout of the entire repository
>> and if I update, everything is there.
>
> Use the Check-for-modifications dialog. Show unmodified items. Enable
> the column "depth", then sort by that column. If not all entries have
> the depth "Fully recursive", then you have to use the "update to
> revision" command on the parent folder, then set the depth combo to
> "fully recursive" and run the update.
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2357464
>
> To unsubscribe from this discussion, e-mail:
> [dev-unsubscribe_at_tortoisesvn.tigris.org].
>
>

-- 
View this message in context: http://old.nabble.com/Merging-problems-tp23812325p26215791.html
Sent from the tortoisesvn - dev mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2414764
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-05 17:30:50 CET

This is an archived mail posted to the TortoiseSVN Dev mailing list.