I discovered during work on this refactoring that my previous
ComP removal broke the way summaries are generated - you can end
up with two lots of changes to the same file summarised on
separate lines instead of being totalled up as they should be.

This bundle should fix that and also add a test for the problem.
(The Conflict Prim removal should have been in another bundle,
but it doesn't really matter.)

3 patches for repository darcs-unstable@darcs.net:screened:

Tue Nov 23 07:42:33 GMT 2010  Ganesh Sittampalam <ganesh@earth.li>
  * test that summaries are merged properly in record

Tue Nov 23 07:42:29 GMT 2010  Ganesh Sittampalam <ganesh@earth.li>
  * get rid of Conflict instance for Prim

Tue Nov 23 07:42:34 GMT 2010  Ganesh Sittampalam <ganesh@earth.li>
  * make summaries of lists work properly

Attachments

• test-that-summaries-are-merged-properly-in-record.dpatch
• unnamed

This patch bundle (with 3 patches) was just applied to the repository http://darcs.net/screened.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_screened.html#bundle-141e05dce8ba7653193bc716a1d2b4022f8d7d78

Might want the test patch (only) for 2.5.1

The test fails on the current darcs head. This means that this bundle 
probably depends on something in screened.

Did you also apply the rest of the bundle and still get a failure? The 
third patch ought to have fixed it.

I guess I should have added the test as failing_ since it was broken at 
the time - the reason I didn't do that is that I actually developed the 
test on the 2.5 branch to prove this was a regression from that.

This patch bundle (with 3 patches) was just applied to the repository http://darcs.net/.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-141e05dce8ba7653193bc716a1d2b4022f8d7d78

Compile and tests ok.
I'm not the most qualified for this bundle, but it's small and here
since 2 months and no other Patch code expert complained so it should be
good enough :) Pushing to darcs.net.

Also, applies without problem on darcs.net now, so the problem reported
by galbolle is gone.

> Tue Nov 23 07:42:33 GMT 2010  Ganesh Sittampalam <ganesh@earth.li>
>  * test that summaries are merged properly in record

OK (also tested it manually).

> Tue Nov 23 07:42:29 GMT 2010  Ganesh Sittampalam <ganesh@earth.li>
>  * get rid of Conflict instance for Prim

Does what it says, which requires to introduce the function
plainSummaryPrims used by patch below.

> Tue Nov 23 07:42:34 GMT 2010  Ganesh Sittampalam <ganesh@earth.li>
>  * make summaries of lists work properly

See Ganesh's explanation:
http://irclog.perlgeek.de/darcs/2011-02-01#i_3245289
Patch is consistent with the explanation, and the new test above passes
with it, so ok.

This patch bundle (with 3 patches) was just applied to the repository http://darcs.net/reviewed.
This message was brought to you by DarcsWatch
http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-141e05dce8ba7653193bc716a1d2b4022f8d7d78