[PATCH 2 of 5] largefiles: only update changed largefiles when merging

[Na'Tosha Bard]

2012/3/12 Matt Mackall <mpm at selenic.com>

> On Fri, 2012-03-09 at 17:13 +0100, Na'Tosha Bard wrote:
> > # HG changeset patch
> > # User Na'Tosha Bard <natosha at unity3d.com>
> > # Date 1331300575 -3600
> > # Node ID 20ec6609b1fbf1b578f05ba3f75d4f90c50086ef
> > # Parent  a18ad914aa21fefd0182b164f69e726ca7b31d15
> > largefiles: only update changed largefiles when merging
>
> I get the following test failure, which looks serious:
>
> --- /home/mpm/hg/tests/test-issue3084.t
> +++ /home/mpm/hg/tests/test-issue3084.t.err
> @@ -99,10 +99,10 @@
>   foo has been turned into a normal file
>   keep as (l)argefile or use (n)ormal file? 0 files updated, 0 files
> merged, 1 files removed, 0 files unresolved
>   (branch merge, don't forget to commit)
> -  getting changed largefiles
> -  1 largefiles updated, 0 removed
>
>   $ hg status
> +  ! foo
>
>   $ cat foo
> -  large
> +  cat: foo: No such file or directory
> +  [1]
>
> ERROR: /home/mpm/hg/tests/test-issue3084.t output changed
> !
> Failed test-issue3084.t: output changed
> # Ran 1 tests, 0 skipped, 1 failed.
>
> real    0m2.188s
> user    0m0.850s
> sys     0m0.273s
>
>
Hmm, I didn't get that error locally.  Will investigate and send a new
patch.

Cheers,
Na'Tosha

-- 
*Na'Tosha Bard*
Build & Infrastructure Developer | Unity Technologies - Copenhagen

*E-Mail:* natosha at unity3d.com
*Skype:* natosha.bard
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120313/54ee6ad9/attachment.html>