On Sat, Oct 04, 2008 at 08:19:53AM -0400, David Roundy wrote:
> On Sat, Oct 04, 2008 at 02:01:28PM +0200, Tommy Pettersson wrote:
> > hunk ./src/Darcs/Patch/Depends.lhs 483
> > case mapRL info a `intersect` mapRL info b of
> > morecommon ->
> > case partitionRL (\e -> info e `elem` morecommon) a of
> > - commonps :> _ -> seal $ commonps :<: common
> > + _ :> commonps -> seal $ commonps :<: common
>
>
> Ah, this change isn't quite right (and would have been caught by the type
> witnesses on push). The problem is that partitionRL returns two ordered
> sequences of patches, and the right-hand one is after the left-hand one, so
> you can't sequence it with common as you do. The correct fix (apparently)
> is to change `elem` to `notElem` to reverse the meaning of the two outputs
> (but retain them in the proper order).
I know there was something I didn't get with these colon-arrows,
but now I think I understand. The `elem` partitioning commuted
them the wrong way, so they were in the wrong context, and
couldn't be appended to the preceding patch set.
> Tommy, I'll let you make this change, so you get the credit,
> since you're the one who tracked this down.
Thanks! Attached.
--
Tommy Pettersson <[EMAIL PROTECTED]>
Sat Oct 4 14:38:51 CEST 2008 Tommy Pettersson <[EMAIL PROTECTED]>
* resolve issue1111: patchset_intersection used wrong selection for partitionRL
We want to commute the non-common patches away, so we can stick the
remaining common patches to the rest of the common patch set.
New patches:
[resolve issue1111: patchset_intersection used wrong selection for partitionRL
Tommy Pettersson <[EMAIL PROTECTED]>**20081004123851
We want to commute the non-common patches away, so we can stick the
remaining common patches to the rest of the common patch set.
] hunk ./src/Darcs/Patch/Depends.lhs 482
\common a b ->
case mapRL info a `intersect` mapRL info b of
morecommon ->
- case partitionRL (\e -> info e `elem` morecommon) a of
+ case partitionRL (\e -> info e `notElem` morecommon) a of
commonps :> _ -> seal $ commonps :<: common
patchset_union :: RepoPatch p => [SealedPatchSet p] -> SealedPatchSet p
Context:
[fix test issue1110, remove duplicates of cd ..
Tommy Pettersson <[EMAIL PROTECTED]>**20081003182126
They got us out of the test dir, up in the file tree hierarchy, to the
darcs root dir, and beyond, where the test continued to run test commands
and cleanups (ooops!!)
]
[TAG 2.1.0pre3
Eric Kow <[EMAIL PROTECTED]>**20081002091241]
Patch bundle hash:
c9425aaed5d167b80d7ca7548f839ff874fa22e0
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
