New submission from Eric Kow <[email protected]>:

Hi Ganesh,

3 patches for repository http://darcs.net/releases/branch-2.5:

This patch is a response to Ben Franksen's observation about the Darcs 2.5
beta 4 release.  What do you think?

(I'm asking you because I've somewhat cheekily resubmitted the
PatternSignatures patch, which we don't need for Darcs 2.5, but maybe
could include in HEAD now that we seem a lot more irreverisibly
committed to GHC 6.10 and higher.)

Naturally, Reinier should go ahead and apply the first 2 patches if
he seems them as being urgent.

Wed Aug 25 16:21:35 BST 2010  Eric Kow <[email protected]>
  * Raise base package dependency to >= 4 (keeping it < 5).
  We now require GHC 6.10.x or higher.

Wed Aug 25 16:24:43 BST 2010  Eric Kow <[email protected]>
  * Document GHC 6.10 dependency.

Fri Jul 23 14:18:43 BST 2010  Eric Kow <[email protected]>
  * Remove PatternSignatures as we currently require GHC 6.10 and up.


___________________________________________________________
This email has been scanned by MessageLabs' Email Security
System on behalf of the University of Brighton.
For more information see http://www.brighton.ac.uk/is/spam/
___________________________________________________________

----------
files: raise-base-package-dependency-to-__-4-_keeping-it-_-5__.dpatch, unnamed
messages: 12296
nosy: ganesh, kowey
status: needs-review
title: Raise base package dependency to >= 4 (k... (and 2 more)

__________________________________
Darcs bug tracker <[email protected]>
<http://bugs.darcs.net/patch365>
__________________________________
New patches:

[Raise base package dependency to >= 4 (keeping it < 5).
Eric Kow <[email protected]>**20100825152135
 Ignore-this: 944cdfa0ea7f940a4a52f24dd9bf6c5b
 We now require GHC 6.10.x or higher.
] hunk ./darcs.cabal 162
       c-sources:      src/win32/send_email.c
       build-depends:  unix-compat >= 0.1.2
 
-    build-depends:   base          < 5,
+    build-depends:   base         >= 4 && < 5,
                      extensible-exceptions >= 0.1 && < 0.2,
                      regex-compat >= 0.71 && < 0.94,
                      mtl          >= 1.0 && < 1.2,
hunk ./darcs.cabal 171
                      filepath     == 1.1.*,
                      haskeline    >= 0.6.2.2 && < 0.7,
                      hashed-storage == 0.5.2,
-                     base >= 3,
                      bytestring >= 0.9.0 && < 0.10,
                      text >= 0.3,
                      old-time   == 1.0.*,
hunk ./darcs.cabal 362
     if os(solaris)
       cc-options:     -DHAVE_SIGINFO_H
 
-    build-depends:   base          < 5,
+    build-depends:   base          >= 4 && < 5,
                      extensible-exceptions >= 0.1 && < 0.2,
                      regex-compat >= 0.71 && < 0.94,
                      mtl          >= 1.0 && < 1.2,
hunk ./darcs.cabal 376
     if !os(windows)
       build-depends: unix >= 1.0 && < 2.5
 
-    build-depends: base >= 3,
+    build-depends: base >= 4 && < 5,
                    bytestring >= 0.9.0 && < 0.10,
                    text >= 0.3,
                    old-time   == 1.0.*,
hunk ./darcs.cabal 502
   if os(solaris)
     cc-options:     -DHAVE_SIGINFO_H
 
-  build-depends:   base          < 5,
+  build-depends:   base          >= 4 && < 5,
                    extensible-exceptions >= 0.1 && < 0.2,
                    regex-compat >= 0.71 && < 0.94,
                    mtl          >= 1.0 && < 1.2,
hunk ./darcs.cabal 516
   if !os(windows)
     build-depends: unix >= 1.0 && < 2.5
 
-  build-depends: base >= 3,
+  build-depends: base >= 4 && < 5,
                  bytestring >= 0.9.0 && < 0.10,
                  text >= 0.3,
                    old-time   == 1.0.*,
hunk ./darcs.cabal 590
     buildable: False
   else
     buildable: True
-    build-depends:   base          < 5,
+    build-depends:   base          >=4 && < 5,
                      extensible-exceptions >= 0.1 && < 0.2,
                      regex-compat >= 0.71 && < 0.94,
                      mtl          >= 1.0 && < 1.2,
hunk ./darcs.cabal 652
     if !os(windows)
       build-depends: unix >= 1.0 && < 2.5
 
-    build-depends: base >= 3,
+    build-depends: base >= 4 && <5,
                    bytestring >= 0.9.0 && < 0.10,
                    haskeline    >= 0.6.2.2 && < 0.7,
                    text >= 0.3,
[Document GHC 6.10 dependency.
Eric Kow <[email protected]>**20100825152443
 Ignore-this: 9714d0bd6abd20a521b7f8f86be274f7
] hunk ./src/building_darcs.tex 27
 
 This will require the following build dependencies:
 \begin{itemize}
-\item GHC 6.8 or higher; and
+\item GHC 6.10 or higher; and
 \item Cabal 1.6 or higher.
 \end{itemize}
 
[Remove PatternSignatures as we currently require GHC 6.10 and up.
Eric Kow <[email protected]>**20100723131843
 Ignore-this: 567dcb5da237e9876e6f590f062da42e
] hunk ./darcs.cabal 145
       PatternGuards
       UndecidableInstances
       ScopedTypeVariables
-      -- PatternSignatures is needed for GHC 6.8
-      PatternSignatures
       RankNTypes
       GADTs
       TypeOperators
hunk ./darcs.cabal 442
       FlexibleContexts,
       FlexibleInstances,
       ScopedTypeVariables,
-      -- PatternSignatures is needed for GHC 6.8
-      PatternSignatures,
       KindSignatures,
       TypeSynonymInstances,
       Rank2Types,
hunk ./darcs.cabal 566
     FlexibleContexts,
     FlexibleInstances,
     ScopedTypeVariables,
-    -- PatternSignatures is needed for GHC 6.8
-    PatternSignatures,
     KindSignatures,
     TypeSynonymInstances,
     Rank2Types,
hunk ./darcs.cabal 690
       FlexibleContexts,
       FlexibleInstances,
       ScopedTypeVariables,
-      -- PatternSignatures is needed for GHC 6.8
-      PatternSignatures,
       KindSignatures,
       TypeSynonymInstances,
       Rank2Types,

Context:

[TAG 2.4.98.4
Reinier Lamers <[email protected]>**20100823183505
 Ignore-this: 8257375d159e0d5a8cb548c6374adf39
] 
[resolve issue1815: work around Cabal sdist permissions issue
Reinier Lamers <[email protected]>**20100823183454
 Ignore-this: e8e9a63a9cdeaea1332c961cdba61b09
] 
[Fix tests that were broken by issue1898 fix.
Eric Kow <[email protected]>**20100815202529
 Ignore-this: f25c2aaed8c0063cee2f31c179345190
 These tests were confused by Darcs UI messages.
] 
[Fix tests that were broken by issue1875 fix.
Eric Kow <[email protected]>**20100815202223
 Ignore-this: bd6e7066799e39f3529a485f6fbeed42
 
 The tests were assuming --set-default.  As these are artifical repositories for
 test cases, we sometimes have cases where we pull/push from freshly created
 repositories with no defaultrepo.
] 
[resolve issue1913: sort changes in treeDiff
Ganesh Sittampalam <[email protected]>**20100819211941
 Ignore-this: 3693df699c664a8f47dc0e0f974c9b7d
] 
[generalise the type of treeDiff
Ganesh Sittampalam <[email protected]>**20100819064152
 Ignore-this: 1b01d02a3581c8967ac612d2d725d8ad
] 
[make issue1913 test actually fail
Ganesh Sittampalam <[email protected]>**20100819060251
 Ignore-this: 1f27289bbdb87b0d3c8ce5793d19d232
] 
[TAG 2.4.98.3
Reinier Lamers <[email protected]>**20100815194519
 Ignore-this: e3a3c30d7dd2fbe49c846c48510a9c3c
] 
[resolve issue1924: remove output options of obliterate
Reinier Lamers <[email protected]>**20100815192010
 Ignore-this: b85544067119c5c80db2ef449aea8456
] 
[Bump version number to 2.4.98.3
Reinier Lamers <[email protected]>**20100809062707
 Ignore-this: 21537d06e0658cd9a44108b1ddb81942
] 
[Also set binary mode on stderr (duplicate for 2.5 branch)
Reinier Lamers <[email protected]>**20100810193256
 Ignore-this: 5f1ed1efaff91967b340cfc51afa6ac5
] 
[TAG 2.4.98.2
Reinier Lamers <[email protected]>**20100726184946
 Ignore-this: 43a9f17e811c2172be76fb1b19aa1497
] 
[Rollback change that allowed --exact-version without context in release
Reinier Lamers <[email protected]>**20100725131540
 Ignore-this: d2e471bfb2edfc664697154519674f3a
] 
[Bump version number to 2.4.98.2
Reinier Lamers <[email protected]>**20100725125520
 Ignore-this: daa7f079bf12a4809705d1d8ff3cc681
] 
[Resolve issue1290: support diff --index.
Eric Kow <[email protected]>**20100813181025
 Ignore-this: 1b663983c67a17f09298c74dc5f2c803
 
 While the matching code knew how to identify the context and
 fluff patches matchFirstPatchset and matchSecondPatchset),
 it did not actually know how to unapply them (getFirstMatch
 and getPartialSecondMatch).
] 
[Fix issue1290 test.
Eric Kow <[email protected]>**20100813175023
 Ignore-this: f39af18caec1b640eccfce1d67f40e8a
 I forgot that we count backwards.  I also try to introduce some asymmetry here
 to make it a bit clearer we're not accidentally passing.
] 
[Resolve issue1909: generate correct context in unpull -O.
Petr Rockai <[email protected]>**20100807171552
 Ignore-this: 8d66f660e691ffe76a8da1eab9e5dcc9
] 
[Accept issue1909: unrecord -O in a tagged repo makes a bad bundle.
Petr Rockai <[email protected]>**20100807171245
 Ignore-this: d8b2d7563cd4612814a209a515358cb4
] 
[Resolve issue1898: notify user when they can use set-default.
Eric Kow <[email protected]>**20100812155901
 Ignore-this: 638b575b32d700cfae9f057293cd5aa8
] 
[Resolve issue1875: avoid accidentally setting default.
Eric Kow <[email protected]>**20100812154847
 Ignore-this: d03cfc6111805515ae4f1ca467beab2c
 Two cases fixed:
  - setting default on dry-run
  - setting default on darcs get --no-set-default
] 
[Generalise issue1875 test on not setting default.
Eric Kow <[email protected]>**20100812154827
 Ignore-this: 127842d85545f411ce71e8d065d2c268
] 
[Accept issue1875: darcs does not honor no-set-default on fetch.
Eric Kow <[email protected]>**20100812152637
 Ignore-this: 32573c47c25ec3e5ad187a5537f50c73
] 
[Fix the remote-repo flag if it's not a URL.
Eric Kow <[email protected]>**20100812150920
 Ignore-this: 10082e2dc200ece25ece1519242962e2
 The word 'fix' here refers to the filepath canonicalisation mechanism
 that makes it easier to check filepath equality.
] 
[Accept issue1898: set-default notification system.
Eric Kow <[email protected]>**20100811141903
 Ignore-this: d33212de428eaf5e2fd85aa4a6cc644a
] 
[Accept issue1913: buggy mapPrimFL.
Eric Kow <[email protected]>**20100810173448
 Ignore-this: 298f8bb5a3dbebafd6de809593a077fb
] 
[Do not fail when there's debris in tests directory.
Petr Rockai <[email protected]>**20100807192133
 Ignore-this: d1fdf93fbed39e3a20bb8d4129dbd4d4
] 
[Restyle issue1873 test and make it run in darcs 2.4.
Eric Kow <[email protected]>**20100807171741
 Ignore-this: 32d1c90bbb45ab91fd3803dc513bc751
 Just to confirm the regression...
] 
[Add test for issue1873 (failed to read patch during apply).
Petr Rockai <[email protected]>**20100807163013
 Ignore-this: 2396ff7f429204f6f10079fb32799e32
] 
[Resolve issue1873: give nicer error when apply fails due to missing patches.
Petr Rockai <[email protected]>**20100804204010
 Ignore-this: b3ddfddeaa7e089717256aa2344ba78c
] 
[Rename findCommonAndUncommon to findUncommon (it does not find common).
Petr Rockai <[email protected]>**20100804195738
 Ignore-this: 8257db493418179be45fad17ab6ffd8e
] 
[Accept issue1290: darcs diff --index support.
Eric Kow <[email protected]>**20100805124559
 Ignore-this: 560bf7125a441de79f0939e5851b95ed
] 
[Resolve issue1892: Improve safety of makeBundle* and fix a couple of related bugs.
Petr Rockai <[email protected]>**20100715093842
 Ignore-this: 9eaa26edfdda09ac444f124130b9e74b
] 
[Export usageHelper
Joachim Breitner <[email protected]>**20100803173150
 Ignore-this: 763398f4ab6b99a59de7666940103daa
 usage is darcs-specific, while usageHelper is not. ipatch could use
 usageHelper.
] 
[Make Darcs.RunCommand independent of Darcs.Commands.Help
Joachim Breitner <[email protected]>**20100803165917
 Ignore-this: 744025a59cdd9ad52595b65d989a638a
 by passing commandControlList via main.hs. This allows re-use of
 Darcs.RunCommand by other binaries with a different set of commands.
] 
[Remove unused imports in Darcs.Commands.Changes
Reinier Lamers <[email protected]>**20100802181249
 Ignore-this: 87d2c72fc74e4442f146d896296fb0db
] 
[Resolve issue1888: fix changes --context.
Petr Rockai <[email protected]>**20100729185143
 Ignore-this: eed1a926b468492198547c438a85e2c9
] 
[Disable optimize --http for Darcs 2.5 release.
Eric Kow <[email protected]>**20100726111249
 Ignore-this: 92b75e71ac3041eee76762bf8042b02c
] 
[Disable packs for darcs 2.5.
Eric Kow <[email protected]>**20100724155438
 Ignore-this: 3b9a6e7b3bede56651a5f6f1b728cfb5
 The packs feature is not sufficiently stable for release.
] 
[resolve issue1716: allow mail header lines of all whitespace in test
Reinier Lamers <[email protected]>**20100722191846
 Ignore-this: 24a12e1cf2631b5363636cf32cf5e8da
   
 Reading RFC822, it seems all-whitespace lines are allowed in the header section
 when you've got trailing space that doesn't fit on the line before.
] 
[Remove [DarcsFlag] usage from Darcs.Patch.Bundle.
Petr Rockai <[email protected]>**20100715081908
 Ignore-this: 62297671dea56fdc0a1cac42f79d6d29
] 
[resolve issue1893: move fields of conditional builds within scope of condition
Ganesh Sittampalam <[email protected]>**20100716192642
 Ignore-this: 5eb1c376138534dd55190e06be701588
 This helps to work around a bug/misfeature in Cabal where it collects up
 things like build-depends without looking at whether the thing they apply
 to is actually buildable
 
] 
[Update link to Darcs repository browser.
Eric Kow <[email protected]>**20100713174550
 Ignore-this: 3546359aec588d1262d6335b033331d0
] 
[move main unit testing code into module with proper name (not Main)
Ganesh Sittampalam <[email protected]>**20100707180600
 Ignore-this: 9c44b4ab083ba44afc9ecaf0752cd130
 This is enable other things than the unit executable to import it
 
] 
[Fix haddock error.
Eric Kow <[email protected]>**20100712145740
 Ignore-this: 2e41b55e17020543744a06ef57cdc599
 The main problem is that bug is a cpp macro, which gets expanded out.
 We just work around this for now.
] 
[Avoid a haddock parse error.
Eric Kow <[email protected]>**20100712142926
 Ignore-this: 97dc0a40b82f9360d374917e243e0490
] 
[Resolve issue1887: add a missing newline to --list-options output.
Petr Rockai <[email protected]>**20100711193535
 Ignore-this: 912b18e8f89be19d186332f5f98a8083
] 
[Fix conflict in Distribution.ShellHarness.
Eric Kow <[email protected]>**20100712132814
 Ignore-this: bfde365cf2d74b05d29ed457b5382f46
 Was between extended test defaults and Control.OldException removal.
] 
[Fix tests in light of recent default flag changes.
Petr Rockai <[email protected]>**20100708195100
 Ignore-this: b8764f2105ed6e7870f4853041b90f9e
] 
[Correctly handle conflicts arising from DarcsMutuallyExclusive options.
Petr Rockai <[email protected]>**20100708194904
 Ignore-this: b6607175899ad6f63044adae7442fd6d
] 
[Avoid adding noCache twice to parameter lists.
Petr Rockai <[email protected]>**20100708195014
 Ignore-this: 59cf4dc50edb4c08367cbc29f321e431
] 
[Make --no-cache an advanced option in all commands.
Eric Kow <[email protected]>**20100701161428
 Ignore-this: 99ea6f8e2235bfdab407a1af9fcfb5cc
] 
[Do not set default repo by default in push, pull, send, fetch.
Eric Kow <[email protected]>**20100701160352
 Ignore-this: 611fe6db2e2fe4d6ad70758d4dfb63de
 As discussed during the 2010-03 sprint and documented in
 http://wiki.darcs.net/DefaultSwitches
] 
[Express --{no-,}set-default as a mutually exclusive option.
Eric Kow <[email protected]>**20100701160138
 Ignore-this: 189522de144a9b9b81239f4a5ff545f0
] 
[Make --edit-description the default.
Eric Kow <[email protected]>**20100701155253
 Ignore-this: ed99469237da51949d915a8dda13706e
] 
[Express --{no-,}edit-description as a mutually exclusive option.
Eric Kow <[email protected]>**20100701155045
 Ignore-this: 419cc3945f89953e33400172d51453e9
] 
[Add a notion of mutually exclusive options with a default.
Eric Kow <[email protected]>**20100701155041
 Ignore-this: e3a29afebe21c9ec6ce355040260e8b
] 
[General purpose function for setting defaults.
Eric Kow <[email protected]>**20100701151816
 Ignore-this: d76a09aa70eba9694d3649300ef7720d
] 
[Fix use of atomicOptions in Darcs.ArgumentDefaults.
Eric Kow <[email protected]>**20100701144916
 Ignore-this: 4fc1df15e34b5c63c47e4c12c4f5963
] 
[Update optimizeHTTP for new two-layer DarcsOption.
Eric Kow <[email protected]>**20100701142543
 Ignore-this: d892c6787ba0aa93a0b36c1e7a79b756
] 
[Refactor traversal of atomic options in DarcsOption.
Eric Kow <[email protected]>**20100621003601
 Ignore-this: 9425a65b80f075e684fd7edaf9b5b868
] 
[Better use of Data.Maybe helpers in Darcs.Arguments.
Eric Kow <[email protected]>**20100621002200
 Ignore-this: 46feb16524e1d61495a7ead46cce1e55
] 
[Flatten DarcsOption type.
Eric Kow <[email protected]>**20100621001926
 Ignore-this: 34a3e0c2a9e989f0f35774d742607c93
 Distinguish between DarcsAtomicOptions and DarcsOption.
] 
[Fix test issue1865-get-context.sh
Thorkil Naur <[email protected]>**20100711121938
 Ignore-this: c68995d55efb6095ada7c24ce0909716
] 
[remove redundant and accidentally checked in definition
Ganesh Sittampalam <[email protected]>**20100709214141
 Ignore-this: d8ad150be87b467f92721c8079158541
] 
[remove dead code
Ganesh Sittampalam <[email protected]>**20100708055640
 Ignore-this: 86104cf3f14952869be820f66f156fbb
] 
[standardize GHC options
Ganesh Sittampalam <[email protected]>**20100707180210
 Ignore-this: b088f0ece12b86980225d81b37d89251
] 
[add comment about why we're using a deprecated option
Ganesh Sittampalam <[email protected]>**20100707061805
 Ignore-this: eb1ec29ce345f96689d39f8f9638987c
] 
[stop using Control.OldException in Setup.lhs + deps
Ganesh Sittampalam <[email protected]>**20100707060932
 Ignore-this: ab49b67e05941402304aed3a8b55f52f
] 
[Fix missing type signature.
Eric Kow <[email protected]>**20100701153511
 Ignore-this: a0669588aca19f0c45326c1244e1c766
] 
[Rename optionFromDarcsoption to optionFromDarcsOption.
Eric Kow <[email protected]>**20100621000207
 Ignore-this: d1c5a5cb84264a404b9b07c9094f96aa
] 
[TAG 2.4.98.1
Reinier Lamers <[email protected]>**20100711120953
 Ignore-this: 6955d46fb3e48bc5bb0f622e495eae1f
] 
Patch bundle hash:
012ef0bf8f65b0d3e8c983848c89c6610030e7a4

Attachment: unnamed
Description: Binary data

_______________________________________________
darcs-users mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to