A small step on the road to sorting out witnesses in the test suite:

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

Wed Jul  7 19:06:00 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * move main unit testing code into module with proper name (not Main)
  This is enable other things than the unit executable to import it
  

Wed Jul  7 20:20:04 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * stop using join_patches in Darcs.Test.Unit

Fri Jul  9 22:38:44 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * get rid of join_patches

Attachments

• move-main-unit-testing-code-into-module-with-proper-name-_not-main_.dpatch
• unnamed

Ganesh Sittampalam <bugs@darcs.net> writes:

> New submission from Ganesh Sittampalam <ganesh@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.

On Mon, 12 Jul 2010, Petr Rockai wrote:

> Ganesh Sittampalam <bugs@darcs.net> writes:
>
>> New submission from Ganesh Sittampalam <ganesh@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...

> Particularly, I am not sure what does it mean and how it popped into
> existence. Other than that, I am ready to push.

Sorry. That should have been amended out, I must have submitted the wrong 
thing. I'll check and resend.

Ganesh

Here's a fixed version.

I had amended the previous version to remove a conflict as I
thought, but I accidentally amended the wrong patch so the end
result was rather messy!

3 patches for repository http://darcs.net:

Wed Jul  7 19:06:00 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * move main unit testing code into module with proper name (not Main)
  This is enable other things than the unit executable to import it
  

Mon Jul 12 17:50:31 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * stop using join_patches in Darcs.Test.Unit

Mon Jul 12 17:50:37 BST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * get rid of join_patches

Attachments

• move-main-unit-testing-code-into-module-with-proper-name-_not-main_.dpatch
• unnamed

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-27dc6f169b957c83017f47ba93a9f32c9e29be5b

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-27dc6f169b957c83017f47ba93a9f32c9e29be5b