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

Re: Text vs binary - eol-style, mime-type, allow merging, etc.

From: Marc Sherman <msherman_at_projectile.ca>
Date: 2005-09-23 16:46:13 CEST

Aleksey Nogin wrote:
>
> It should be resolved the exact same way as it happens today! An
> implicitly defined notion of "mergeable" exists already (currently it's
> equivalent to "does not have a binary mime-type"), I am just proposing
> to make it possible to define it explicitly.
>
> P.S. I am not sure how it works today, but IMHO the merge should occur
> only if all 3 versions are mergeable. Although looking at only the local
> copy is not completely unreasonable.

 From what I've been able to see (as a user, not looking at the code),
the current behaviour is as you describe -- only merge if all sources
are marked mergable. This is a pain when you discover that you've set
the mime-type incorrectly for a file, and it is in fact mergable.

Is there any way to force a merge of a file that's supposedly unmergable?

- Marc

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 23 16:46:16 2005

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