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

These self-screened patches merge in branch-2.5 and resolve conflicts.

Fri Oct 15 08:39:19 EDT 2010  Reinier Lamers <tux_rocker@reinier.de>
  * Force regex-posix version to be greater than 0.94.4 on Windows to avoid linking errors
  
  This is a port to the 2.5 branch of:
  Tue Sep 14 13:58:31 PDT 2010  Simon Michael <simon@joyful.com>
    * require regex-posix >= 0.94.4 on windows to avoid link errors with with HP 2010.2.0.0
      See http://trac.haskell.org/haskell-platform/ticket/137 . On windows we
        now ensure a new enough version of regex-posix (which regex-compat uses).

Fri Oct 15 09:20:34 EDT 2010  Reinier Lamers <tux_rocker@reinier.de>
  * Bump version number to 2.4.99.1 for 2.5 RC 1

Fri Oct 15 10:29:41 EDT 2010  Reinier Lamers <tux_rocker@reinier.de>
  * Bump version number to 2.5

Fri Oct 15 10:34:39 EDT 2010  Reinier Lamers <tux_rocker@reinier.de>
  * No longer say that building with GHC 6.8 is possible in README

Sun Oct 24 11:17:59 EDT 2010  Reinier Lamers <tux_rocker@reinier.de>
  * Add entry for darcs 2.5 to NEWS file

Mon Oct 11 16:52:53 EDT 2010  Ganesh Sittampalam <ganesh@earth.li>
  * write out tag before trying to optimize inventory
  
  This is a backport of the patch from HEAD to the 2.5 branch.
  
  This fixes 'darcs tag' for old-fashioned repos.
  The original code seems obviously wrong, so it's hard to understand
  why things only started breaking after this patch:
  
    Sat Sep 11 19:53:55 BST 2010  Dmitry Astapov <dastapov@gmail.com>
     * Resolve issue1942: fix the fix which ended up too strict due to unsealing.
     (manually backpopting fix by Petr Rockai to mainline)
  

Thu Nov  4 17:26:54 EDT 2010  Eric Kow <kowey@darcs.net>
  * Fix conflict with darcs 2.5 backport of issue1942 patch.

Thu Nov  4 21:44:42 EDT 2010  Eric Kow <kowey@darcs.net>
  * Resolve darcs.cabal conflict with branch-2.5.

Attachments

• force-regex_posix-version-to-be-greater-than-0_94_4-on-windows-to-avoid-linking-errors.dpatch
• unnamed

This patch bundle (with 8 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-ae63b4c686eac9365d3d9dd2352434fd037e12a2

This bundle contains what is now needed to be pulled from screened to head to apply without
conflicts.

This means that backporting the 2.5 release is blocked by:
-patch421
-patch436
-patch442
-patch378

I was not able to find the last patch of this bundle in the patch tracker. Eric, do you have
any idea where it can be?

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

Fri Oct 15 14:39:19 CEST 2010  Reinier Lamers <tux_rocker@reinier.de>
  * Force regex-posix version to be greater than 0.94.4 on Windows to avoid linking errors
  
  This is a port to the 2.5 branch of:
  Tue Sep 14 13:58:31 PDT 2010  Simon Michael <simon@joyful.com>
    * require regex-posix >= 0.94.4 on windows to avoid link errors with with HP 2010.2.0.0
      See http://trac.haskell.org/haskell-platform/ticket/137 . On windows we
        now ensure a new enough version of regex-posix (which regex-compat uses).
448


Fri Oct 15 15:20:34 CEST 2010  Reinier Lamers <tux_rocker@reinier.de>
  * Bump version number to 2.4.99.1 for 2.5 RC 1
448

Fri Oct 15 16:29:41 CEST 2010  Reinier Lamers <tux_rocker@reinier.de>
  * Bump version number to 2.5
448

Fri Oct 15 16:34:39 CEST 2010  Reinier Lamers <tux_rocker@reinier.de>
  * No longer say that building with GHC 6.8 is possible in README
448

Sun Oct 24 17:17:59 CEST 2010  Reinier Lamers <tux_rocker@reinier.de>
  * Add entry for darcs 2.5 to NEWS file
448

Mon Oct 11 22:52:53 CEST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * write out tag before trying to optimize inventory
448  

  This is a backport of the patch from HEAD to the 2.5 branch.
  
  This fixes 'darcs tag' for old-fashioned repos.
  The original code seems obviously wrong, so it's hard to understand
  why things only started breaking after this patch:
  
    Sat Sep 11 19:53:55 BST 2010  Dmitry Astapov <dastapov@gmail.com>
     * Resolve issue1942: fix the fix which ended up too strict due to unsealing.
     (manually backpopting fix by Petr Rockai to mainline)

Thu Nov  4 22:26:54 CET 2010  Eric Kow <kowey@darcs.net>
  * Fix conflict with darcs 2.5 backport of issue1942 patch.
448

Sun Oct 17 13:44:02 CEST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * drop some dead exports/code from ByteStringUtils
442

Thu Oct 14 08:03:30 CEST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * simplify showContextHunk
421

Thu Oct 14 19:48:38 CEST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * Clean up pending API a bit
421

Thu Oct 14 22:27:17 CEST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * stop using Patch instances for reading/writing pending
421

Sun Oct 17 12:40:56 CEST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * get rid of ComP
  This makes the treatment of v1 and v2 patches more consistent.
421  

Mon Oct 18 19:49:15 CEST 2010  Eric Kow <kowey@darcs.net>
  * Remove literate Haskell from Darcs.Test.Unit.
378

Tue Oct 19 00:27:25 CEST 2010  Eric Kow <kowey@darcs.net>
  * Consolidate unit test running logic into test harness.
378

Tue Oct 19 00:42:09 CEST 2010  Eric Kow <kowey@darcs.net>
  * Sweep Darcs.Email tests into a single suite.
378

Tue Oct 19 00:43:04 CEST 2010  Eric Kow <kowey@darcs.net>
  * Sweep Darcs.Patch.Info tests into a single suite.
378

Tue Oct 19 08:40:19 CEST 2010  Eric Kow <kowey@darcs.net>
  * Split unit tests into Darcs.Patch and miscellaneous ones.
378

Wed Oct 20 07:44:43 CEST 2010  Ganesh Sittampalam <ganesh@earth.li>
  * make test harness optional
436

Fri Nov  5 02:44:42 CET 2010  Eric Kow <kowey@darcs.net>
  * Resolve darcs.cabal conflict with branch-2.5.
448

Wed Oct 20 01:59:50 CEST 2010  Eric Kow <kowey@darcs.net>
  * Resolve conflicts between test harness extensions and cleanups.
I cannot find this in the patch tracker!!

Attachments

• force-regex_posix-version-to-be-greater-than-0_94_4-on-windows-to-avoid-linking-errors.dpatch
• unnamed

This patch bundle (with 20 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-b42884a1294938e1090424f0108431a00483c850

On Wed, Nov 10, 2010 at 12:20:29 +0000, Florent Becker wrote:
> This bundle contains what is now needed to be pulled from screened to head to apply without
> conflicts.

Ah, thanks for looking into that :-)

Note the possibility of just doing an unstable+branch-2.5 conflict
resolution (if the blocking is really unacceptable).

The cost is an extra conflict, but I guess darcs could always use
a conflict resolution workout from within the team.

> Wed Oct 20 01:59:50 CEST 2010  Eric Kow <kowey@darcs.net>
>   * Resolve conflicts between test harness extensions and cleanups.
> I cannot find this in the patch tracker!!

I think that's patch425 (plugging that patch name into the roundup
patch search UI)

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
For a faster response, try +44 (0)1273 64 2905 or
xmpp:kowey@jabber.fr (Jabber or Google Talk only)

actually, there is no dependency on patch442, but on patch422

Are we good to go?

-patch421: accepted
-patch422: accepted
-patch436: accepted-pending-tests
-patch378: accepted-pending-tests

This patch bundle (with 8 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-ae63b4c686eac9365d3d9dd2352434fd037e12a2

This patch bundle (with 20 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-b42884a1294938e1090424f0108431a00483c850

This patch bundle (with 8 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-ae63b4c686eac9365d3d9dd2352434fd037e12a2

This patch bundle (with 20 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-b42884a1294938e1090424f0108431a00483c850