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

Re: Beginner's questions

From: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: 2007-05-29 02:09:22 CEST

On May 28, 2007, at 07:15, Holger Schulz wrote:

> Dear Ryan,
> thanks. Your answers helped me a lot. May I ask some further
> questions to ensure I got everything right?
> Am 2007-05-28 um 11:16 schrieb Ryan Schmidt:
>> On May 28, 2007, at 03:35, Holger Schulz wrote:
>>> after installing Subversion via fink on MacOS X 10.4.9 and
>>> running some test, I have some questions which some of you
>>> might be able to answer.
>>> 1. Okay, the data in my repositories will mainly be LaTeX files,
>>> since I need these for my work. Typesetting will produce PDF file,
>>> which shouldn't be merged but overwritten. Does subversion know that
>>> overwriting is necessary in these cases ordoes I have to tell it
>>> somehow? Same question for MS-Word documents and similar which I
>>> have
>>> to use sometimes in collaboration with some colleagues.
>> Subversion does handle binary files just fine, but it will not
>> blindly overwrite data. If, for example, two people independently
>> modify a PDF or Word document, then there will be a conflict,
>> which a developer will have to resolve by examining both versions
>> of the file to determine what to do.
> At this time my reps will only be used by myself.

Ok. You can still run into the situation by yourself, for example if
you have two working copies and make changes to the same Word file in
both working copies.

>> With text files, you would get a line-by-line diff, but it can't
>> show you that with binary files since it doesn't know how to
>> interpret binary formats.
> Does that mean, that subversion does recognize which data is binary
> and which can be understood as text? Or do have to tell subversion
> what is what?

Subversion will mark files as binary as necessary... except for PDFs,
which it will detect as text, since PDF is a largely text-based
format. You can inform Subversion that you would like PDFs to be
treated as binary by setting the svn:mime-type property on those
files. See also the section in the book on automatic properties.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 29 02:11:40 2007

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

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