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

RE: TortoiseSVN 1.8 client doesn

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Mon, 16 Sep 2013 16:23:10 +0000

> I've been using TSVN for at least 5 years, various versions going back to before
> 1.6. When working with LabVIEW files, most of which are binary, TSVN
> seemed to "know" this and never did a "merge" of the files when doing an
> update.
> I just built a new PC, and downloaded TSVN 1.8.2 (I'd previously been using
> 1.7.13). My first update, TSVN reported that it had done merges!!
> I've checked, and my previous installs had no special code to tell TSVN that
> LabVIEW files were binary (the Config file was never directly edited). I'm very
> nervous about possibly corrupting my LabVIEW work -- any suggestions on how
> to proceed? Any hints why 1.8 sees the LabVIEW files as "merge-able" where
> earlier versions of TSVN did not? Is this a Bug or a Feature, and how should we
> deal with it?
> I'll attach a simple "Hello, World" LabVIEW source file as a demo.

I am pretty sure all you have to do is ensure that the mime-type:binary is set on your lab view files.

What do you mean by is sees them as "mergeable"?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-16 18:23:18 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.