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

Re: "Resolved" causing problems?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 04 Aug 2009 08:34:07 +0200

On 04.08.2009 08:33, Hans-Emil Skogh wrote:
> >> Resolved conflicted state of 'lib\RadixAudit-Debug.pdb'
> >> Resolved conflicted state of 'lib\RadixEngine-Debug.lib'
> >> Resolved conflicted state of 'lib\MEICashflowSC-Debug.map'
> ...
> > TSVN does some additional work: before marking a file as resolved, it
> > scans the whole file for conflict markers (the ">>>>>", "====" and
> > "<<<<<" lines) and issues a warning if it finds one.
> ...
> > I guess I have to find a way to not check binary files.
> Hopefully these files already have a svn:mime-type property set
> indicating that they are not text files. Perhaps that would be a good
> thing to check for?

Already working on that :)

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2379881
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-04 08:34:26 CEST

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