Re: Merging problems PS

Stefan Küng wrote:
> 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.
>
I'm not sure what's changed but I now get the following error for any
type of merge:
Error: REPORT of '/svn/venuefinder/!svn/bc/867': 200 OK (http://ulysses)

Instead of "Cannot reintegrate into a working copy not entirely at
infinite depth" which I seemed to be getting before.

Nick...

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2357466

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-01 13:23:09 CEST