[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: Robert Dailey <rcdailey_at_gmail.com>
Date: Wed, 5 Aug 2009 15:04:55 -0500

I tested this issue again on TortoiseSVN nightly and the problem still
exists. Below is my version information. According to the
changelog<http://nightlybuilds.tortoisesvn.net/latest/changelog.html>,
this revision should include the fix Stefan made.
TortoiseSVN 1.6.99, Build 16802 - 32 Bit -dev, 2009/08/04 17:32:20
Subversion 1.6.4, -dev
apr 1.3.5
apr-utils 1.3.7
neon 0.28.4
OpenSSL 0.9.8k 25 Mar 2009
zlib 1.2.3

---------
Robert Dailey

On Tue, Aug 4, 2009 at 8:26 AM, Hans-Emil Skogh
<Hans-Emil.Skogh_at_tritech.se>wrote:

> >> 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.
> >> But of course, that's intended for text files - I guess in your case
> >> since you're resolving binary files that check simply takes way too
> long.
> >> I guess I have to find a way to not check binary files.
> ...
> > Does Subversion add the markers to binary files as well?
> > Or does it somehow determine what is text and only insert
> > them into those kinds of files?
>
> Check out the File Content Type section in the SVN Book:
>
> http://svnbook.red-bean.com/en/1.5/svn.advanced.props.file-portability.html#svn.advanced.props.special.mime-type
>
> Hans-Emil
>

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2380614

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-05 22:05:07 CEST

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