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

Re: Tortoise SVN: Conflicts

From: Jody Shumaker <jody.shumaker_at_gmail.com>
Date: 2006-03-09 15:51:30 CET

On 3/8/06, AvNi ShAh <ajshah16@hotmail.com> wrote:
>
>
>
> Hi,
>
> I have two questions:
>
> 1. I am testing the software for my project and had my collegue change a
> file with one or two changes and I did made two other changes (not the same
> lines/words). When I went to commit, I received an out of date update
> error, that I expected. So then I updated my local copy and it said that
> one or more files is in a conflicted state. I thought that if the same
> exact line or data was not changed, then it should merge the data into one
> document. Do you know why this would be happening?
>

What type of file is it? With binary files (such as word documents)
there is no per line mergine, and thus if any portion of the file has
changed, it will cause a conflict.

> 2. In trying to view differences in applications other than Microsoft Work,
> such as Excel and Powerpoint, I received an error message. Are these types
> of files not supported by TortoiseSVN?
>

The diff for Word documents only works because of a vb script. If you
go into the TortoiseSVN uynder the "External Programs\Diff Viewer"
click the advanced button. In there is where it defines the vbs to run
to diff .doc files. If you want to diff any other binary format
files, you need to add their extension and some program capable of
diffing them.

- Jody

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Mar 9 15:52:33 2006

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