This fix being in Darcs/Patch/ makes me a bit uncomfortable, but
it should be rather straight forward. From reading the code for
partitionRL it is clear it puts the interesting (common, in this
case) patches to the right, but patchset_intersection wrongly
picked the left side (which would have been the complement of
common patches from one of the sets).
Sat Oct 4 01:12:44 CEST 2008 Tommy Pettersson <[EMAIL PROTECTED]>
* resolve issue1111: use correct side of return from partitionRL
Sat Oct 4 01:03:23 CEST 2008 Tommy Pettersson <[EMAIL PROTECTED]>
* use longer patch names in issue1111 test for safer grep result
The 'not grep C out' found the author--date line of patch A, which
contained my timezone (CEST), so the test failed even when it should have
succeeded.
--
Tommy Pettersson <[EMAIL PROTECTED]>
Sat Oct 4 01:03:23 CEST 2008 Tommy Pettersson <[EMAIL PROTECTED]>
* use longer patch names in issue1111 test for safer grep result
The 'not grep C out' found the author--date line of patch A, which
contained my timezone (CEST), so the test failed even when it should have
succeeded.
Sat Oct 4 01:12:44 CEST 2008 Tommy Pettersson <[EMAIL PROTECTED]>
* resolve issue1111: use correct side of return from partitionRL
New patches:
[use longer patch names in issue1111 test for safer grep result
Tommy Pettersson <[EMAIL PROTECTED]>**20081003230323
The 'not grep C out' found the author--date line of patch A, which
contained my timezone (CEST), so the test failed even when it should have
succeeded.
] hunk ./bugs/issue1111-pull-intersection.sh 16
darcs initialize
echo A > A
darcs add A
-darcs record -a -m A
+darcs record -a -m Aismyname
echo B > B
darcs add B
hunk ./bugs/issue1111-pull-intersection.sh 19
-darcs record -a -m B
+darcs record -a -m Bismyname
cd ..
darcs get temp1 temp2
hunk ./bugs/issue1111-pull-intersection.sh 28
darcs obliterate --last 1 -a
echo C > C
darcs add C
-darcs record -a -m C
+darcs record -a -m Cismyname
cd ..
mkdir temp3
hunk ./bugs/issue1111-pull-intersection.sh 38
darcs changes > out
cat out
-grep A out
-not grep B out
-not grep C out
+grep Aismyname out
+not grep Bismyname out
+not grep Cismyname out
cd ..
rm -rf temp1 temp2 temp3
[resolve issue1111: use correct side of return from partitionRL
Tommy Pettersson <[EMAIL PROTECTED]>**20081003231244] move ./bugs/issue1111-pull-intersection.sh ./tests/issue1111-pull-intersection.sh
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
patchset_union :: RepoPatch p => [SealedPatchSet p] -> SealedPatchSet p
patchset_union [] = seal (NilRL :<: NilRL)
Context:
[TAG 2.1.0pre3
Eric Kow <[EMAIL PROTECTED]>**20081002091241]
Patch bundle hash:
eca02d5c1f50baa169b99cdf0c717b0eb60a139d
_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users
