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

Re: svn does not seem able to merge

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-08-17 21:42:12 CEST

On Tue, 2004-08-17 at 14:36, Merlin Moncure wrote:
> Hello, I am new to this list. I just recently converted our repository
> from cvs to svn with great success. Everything was relatively painless,
> except for the following:
>
> Note: We are running svn 1.0 on winxp server with winxp clients. Client
> tool is tortoisesvn. Server is running stock except fireaeomon to make
> it as a service.
>
> Every time one of the developers updates a file that both he and another
> developer has edited, instead of the changes being merged the whole file
> is marked as a conflict.
>
> In short, svn does not seem to be merging the files together under any
> circumstances. Has anybody else experienced this?

Are the files marked with svn:mime-type properties that signify
"binaryness"? Like, 'svn:mime-type=application/x-octet-stream'? If so,
the svn client will never attempt to do contextual merges on the file.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 17 21:44:21 2004

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