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

Re: Weird conflicts for no reason

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 10 Oct 2008 22:53:54 +0200

Robert Dailey wrote:
> On Fri, Oct 10, 2008 at 3:18 PM, Robert Dailey <rcdailey_at_gmail.com
> <mailto:rcdailey_at_gmail.com>> wrote:
>
> I'll give you access to the repository. I'll email the information
> and instructions to your personal email address.
>
>
>
> Interesting. I moved the repository to a different server, which
> essentially switched from the http:// protocol to svn://, and doing the
> *exact* same merge process results in *NO* conflicts. I'm wondering if
> Apache is doing something funny to the files?

Not apache, but the url parsing/handling in ra_dav in the svn library
seems to have a bug.
Maybe you can get a reproduction recipe if you try something with the
same filename/path that give the error?

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-10-10 22:54:12 CEST

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