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

Re: Merging problems PS

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 01 Jun 2009 13:27:03 +0200

Nick Gilbert wrote:
> 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.

I've never been that happy with the "reintegrate" merge function. It
rarely works :)
Have you tried a normal merge, specifying a revision range (or even an
empty revision range to merge everything)?


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-06-01 13:27:15 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.