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

Re: binary files & merges

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-03-15 17:13:23 CET

Ben Collins-Sussman <sussman@collab.net> writes:

> So here's my final question: should we now put the binary file into a
> 'conflicted' state, and track the fulltexts as usual?
>
> * argument against: it's not conflicted. we didn't even attempt to
> do a merge. how would we even know what a conflict looks like?

It is conflicted :) Any time there are both local and remote changes
there is a conflict. It so happens that for text files Subversion can
merge and thus sometimes resolve the conflict.

>
> * argument for: a conflicted state would force the user to
> recognize that his locally-modified working file is incomplete;
> we don't want to encourage people to ignore patches from the
> server, just because the patches aren't automatically merged.
>
> I think I'm advocating the conflicted state here, but I wanted to see
> what others think, as a sanity check.

The conflict is correct.

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 15 17:14:02 2002

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