[PATCH stable] largefiles: handle merges between normal files and largefiles (issue3084)

[Martin Geisler]

Matt Mackall <mpm at selenic.com> writes:

> On Wed, 2011-12-14 at 11:18 +0100, Na'Tosha Bard wrote:
>> 2011/12/9 Martin Geisler <mg at aragost.com>
>> 
>> > # HG changeset patch
>> > # User Martin Geisler <mg at aragost.com>
>> > # Date 1323448500 -3600
>> > # Branch stable
>> > # Node ID f9390ba27de9bc3661b2b2bb83a3ce9e81f41772
>> > # Parent  5b66e55c0d938a524c0b6e933010c7a5f728bc30
>> > largefiles: handle merges between normal files and largefiles (issue3084)
>> >
>> 
>> Matt,
>> 
>> After discussion both here and on IRC, our (meaning Martin and I)
>> conclusion is that we would like for this patch to be applied as-is.  The
>> "hg status" output is not any worse with this patch than it is without the
>> patch, and this patch fixes a really bad bug (which is the reason why we
>> contracted to Martin to fix it).
>> 
>> I suggest we improve "hg status" separately, after we figure out for sure
>> what to show and what the best way to fix it is.  I would also like to
>> spend some time with the programmers and artists on my team to gather some
>> real-world use cases about what sorts of merge situations they hit and what
>> they would like to be able to do.  Improving the merge to make it more like
>> a regular Mercurial merge can also come as later improvements.
>
> Ok. Martin, please resend your latest version.

I've sent a new version where status filters away the extra removed
files.

-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20111215/3ee84900/attachment.pgp>