monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] line endings


From: Nathaniel Smith
Subject: Re: [Monotone-devel] line endings
Date: Tue, 7 Feb 2006 03:35:33 -0800
User-agent: Mutt/1.5.11

On Thu, Feb 02, 2006 at 08:10:36AM -0500, Yury Polyanskiy wrote:
> And of course it'd be MUCH better to have get_linesep_conv() NOT called
> for binary files (or at least for manual_merge files as a quick hack).

For a bit of history... when manual_merge was added, the argument was
to explicitly _avoid_ trying to come up with the Ultimate Design For
All Things Content Sensitive.  The argument was that manual merging
was on particular thing one might want (even on files that are
textual!  E.g., if you have a special-purpose merger for some XML
documents).  So manual_merge and line ending conversion should perhaps
be kept orthogonal.

-- Nathaniel

-- 
.i dei jitfa fanmo xatra




reply via email to

[Prev in Thread] Current Thread [Next in Thread]