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

[TSVN] Re: entire file in conflict?

From: Eric Hanchrow <offby1_at_blarg.net>
Date: 2005-09-26 17:56:18 CEST

>>>>> "Lübbe" == Lübbe Onken <l.onken@rac.de> writes:

    Lübbe> Eric Hanchrow wrote:
>> What might be causing this?

    Lübbe> Some changes in svn:eol-style or an editor that has
    Lübbe> converted blanks to tab or vice versa?

I don't think so -- whitespace was the first thing I suspected, so I
checked the files carefully, and they didn't differ in whitespace.

I think this observation is significant, but I don't understand it:

    The file in question was named "makelookup.pm"; I noticed that a
    file named "makelookup.pm.merge-left.r0" existed, and was empty.

The files for which an empty "*.merge-left.r0" existed had the
problem; those for which a non-empty *.merge-left.r<non-zero>" existed
did not.

... attacking this movie is like kicking a dog for not being
better at calculus.
        -- Roger Ebert (on the 2005 remake of "The Longest Yard")
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 26 18:20:07 2005

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