[darcs-users] [patch299] move main unit testing code into module ... (and 2 more)
Petr Rockai
me at mornfall.net
Mon Jul 12 11:42:24 UTC 2010
Ganesh Sittampalam <bugs at darcs.net> writes:
> New submission from Ganesh Sittampalam <ganesh at earth.li>:
>
> A small step on the road to sorting out witnesses in the test suite:
Looks OK, but I am somewhat confused by the conflictor that appears in
the second patch...
conflictor [
hunk ./src/Darcs/Test/Unit.lhs 501
- quickhunk 7 "d" "ef"]:<
- join_patches [quickhunk 3 "a" "bc",
- quickhunk 8 "d" "ef"]),
+ quickhunk 7 "d" "ef"]),
]
|:
hunk ./src/Darcs/Test/Unit.lhs 496
- (join_patches [quickhunk 1 "a" "bc",
- quickhunk 6 "d" "ef"]:\/:
- join_patches [quickhunk 3 "a" "bc",
- quickhunk 8 "d" "ef"],
- join_patches [quickhunk 1 "a" "bc",
- quickhunk 7 "d" "ef"]:<
- join_patches [quickhunk 3 "a" "bc",
- quickhunk 8 "d" "ef"]),
+ (joinPatches (quickhunk 1 "a" "bc" :>:
+ quickhunk 6 "d" "ef" :>: NilFL):\/:
+ joinPatches (quickhunk 3 "a" "bc" :>:
+ quickhunk 8 "d" "ef" :>: NilFL),
+ joinPatches (quickhunk 1 "a" "bc" :>:
+ quickhunk 7 "d" "ef" :>: NilFL):<
+ joinPatches (quickhunk 3 "a" "bc" :>:
+ quickhunk 8 "d" "ef" :>: NilFL)),
Particularly, I am not sure what does it mean and how it popped into
existence. Other than that, I am ready to push.
Yours,
Petr.
More information about the darcs-users
mailing list