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

Re: [TSVN] Re: entire file in conflict?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-09-26 18:29:24 CEST

Eric Hanchrow wrote:
> 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.

eol-style isn't about whitespace but lineendings (CRLF/LF).

> 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.

An empty merge-left.r0 means that the file didn't exist and got added.
But seems you either already added the same file or you removed a file
with the same name already.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
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:31:51 2005

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