DarcsURL: http://darcs.net/screened
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=_"

--=_
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

A couple of Windows-specific fixes

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

Fri Feb  4 19:04:43 GMT Standard Time 2011  Ganesh Sittampalam <ganesh@eart=
h.li>
  * add test that non-interactive commands work when stdin is /dev/null
  This is currently going wrong on Windows

Fri Feb  4 22:16:21 GMT Standard Time 2011  Ganesh Sittampalam <ganesh@eart=
h.li>
  * fix problem on Windows when stdin is /dev/null
  This was going wrong because haskeline's default Behavior tries
  to do hGetEcho on stdin, which fails.

Fri Feb  4 22:16:32 GMT Standard Time 2011  Ganesh Sittampalam <ganesh@eart=
h.li>
  * redo issue1465 test to use haskell instead of shell for fake editors
  This is a lot slower, but more portable as shell scripts aren't
  directly executable on Windows


--=_
Content-Type: text/x-darcs-patch; name="add-test-that-non_interactive-commands-work-when-stdin-is-_dev_null.dpatch"
Content-Transfer-Encoding: quoted-printable
Content-Description: A darcs patch for your repository!


New patches:

[add test that non-interactive commands work when stdin is /dev/null
Ganesh Sittampalam <ganesh@earth.li>**20110204190443
 Ignore-this: 9a3ab552ed3695d78b833863bfae63b0
 This is currently going wrong on Windows
] addfile ./tests/failing-devnull.sh
hunk ./tests/failing-devnull.sh 1
+#!/usr/bin/env bash
+## Test that non-interactive darcs commands work when stdin is /dev/null
+##
+## Copyright (C) 2011 Ganesh Sittampalam
+##
+## Permission is hereby granted, free of charge, to any person
+## obtaining a copy of this software and associated documentation
+## files (the "Software"), to deal in the Software without
+## restriction, including without limitation the rights to use, copy,
+## modify, merge, publish, distribute, sublicense, and/or sell copies
+## of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be
+## included in all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+## EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+## MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+## NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+## BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+## ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+## CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+## SOFTWARE.
+
+. lib                  # Load some portability helpers.
+darcs init      --repo R        # Create our test repo.
+
+cd R
+touch wibble
+darcs rec -lam"wibble" < /dev/null
[fix problem on Windows when stdin is /dev/null
Ganesh Sittampalam <ganesh@earth.li>**20110204221621
 Ignore-this: 547aa9cd2fa27db2b147a2e931c3fed6
 This was going wrong because haskeline's default Behavior tries
 to do hGetEcho on stdin, which fails.
] move ./tests/failing-devnull.sh ./tests/devnull.sh
hunk ./src/ByteStringUtils.hs 72
 #endif
 import System.IO
 import System.IO.Unsafe         ( unsafePerformIO )
-import System.Console.Haskeline ( runInputT, defaultSettings )
+import System.Console.Haskeline ( InputT, runInputTBehavior, defaultSettin=
gs, useFileHandle )
 import System.Console.Haskeline.Encoding ( decode, encode )
 =

 import Foreign.Storable         ( peekElemOff, peek )
hunk ./src/ByteStringUtils.hs 519
           end =3D the_s + l
       findit n the_s
 =

+-- we use a custom Behavior because otherwise on Windows haskeline tries t=
o
+-- do hGetEcho on stdin which fails if stdin is e.g. /dev/null
+unsafeRunInput :: InputT IO a -> a
+unsafeRunInput =3D unsafePerformIO . runInputTBehavior (useFileHandle stdi=
n) defaultSettings
+
 -- | Decode a ByteString to a String according to the current locale
 -- unsafePerformIO in the locale function is ratified by the fact that GHC=
 6.12
 -- and above also supply locale conversion with functions with a pure type=
.
hunk ./src/ByteStringUtils.hs 529
 -- Unrecognized byte sequences in the input are skipped.
 decodeLocale :: B.ByteString -> String
-decodeLocale =3D unsafePerformIO . runInputT defaultSettings . decode
+decodeLocale =3D unsafeRunInput . decode
 =

 -- | Encode a String to a ByteString with latin1 (i.e., the values of the
 -- characters become the values of the bytes; if a character value is grea=
ter
hunk ./src/ByteStringUtils.hs 539
 =

 -- | Encode a String to a ByteString according to the current locale
 encodeLocale :: String -> B.ByteString
-encodeLocale =3D unsafePerformIO . runInputT defaultSettings . encode
+encodeLocale =3D unsafeRunInput . encode
 =

 -- | Take a @String@ that represents byte values and re-decode it acording=
 to
 -- the current locale.
[redo issue1465 test to use haskell instead of shell for fake editors
Ganesh Sittampalam <ganesh@earth.li>**20110204221632
 Ignore-this: dd476ac3633baf8e3433f4fe9b661cb1
 This is a lot slower, but more portable as shell scripts aren't
 directly executable on Windows
] hunk ./tests/issue1465_ortryrunning.sh 31
 darcs init      --repo R        # Create our test repo.
 =

 FAKE_EDITOR_HOME=3D`pwd`
-cat <<FAKE > editor-good
-echo fake > \$1
+cat <<FAKE > editor-good.hs
+import System.Environment
+import System.IO
+main =3D getArgs >>=3D \[name] -> writeFile name "fake"
 FAKE
hunk ./tests/issue1465_ortryrunning.sh 36
-chmod u+x editor-good
+ghc -o editor-good --make editor-good.hs
 =

hunk ./tests/issue1465_ortryrunning.sh 38
-cat <<FAKE > editor-bad
-exit 127
+cat <<FAKE > editor-bad.hs
+import System.Exit
+main =3D exitWith (ExitFailure 127)
 FAKE
hunk ./tests/issue1465_ortryrunning.sh 42
-chmod u+x editor-bad
+ghc -o editor-bad --make editor-bad.hs
 =

hunk ./tests/issue1465_ortryrunning.sh 44
-cat <<FAKE > editor-gave-up
-exit 1
+cat <<FAKE > editor-gave-up.hs
+import System.Exit
+main =3D exitWith (ExitFailure 1)
 FAKE
hunk ./tests/issue1465_ortryrunning.sh 48
-chmod u+x editor-gave-up
+ghc -o editor-gave-up --make editor-gave-up.hs
 =

hunk ./tests/issue1465_ortryrunning.sh 50
-cat <<VI > vi
-echo vi > \$1
+cat <<VI > vi.hs
+import System.Environment
+import System.IO
+main =3D getArgs >>=3D \[name] -> writeFile name "vi"
 VI
hunk ./tests/issue1465_ortryrunning.sh 55
-chmod u+x vi
+ghc -o vi --make vi.hs
 =

 cd R
 mkdir d

Context:

[add new types of repository job to clean up Convert a bit
Ganesh Sittampalam <ganesh@earth.li>**20110110070017
 Ignore-this: 217cecf2daeba6edd0e8b1fdbc88f061
 Still not pretty, but at least the unsafeCoerce# is further down!
] =

[generic job transformation function
Ganesh Sittampalam <ganesh@earth.li>**20101213190259
 Ignore-this: 17dec7fe72fa29422b3998d73cf09e8e
] =

[get rid of the ($-) operator
Ganesh Sittampalam <ganesh@earth.li>**20101213185111
 Ignore-this: 70bc6e646356c7bb48ec4894634cd0dc
 =

 Wrap up the Rank2 types of the repository handling operations in a
 datatype rather than requiring the specialised ($-). This helps with a
 planned change to add more functionality to these operations.
 =

] =

[issue1988 cleanup: accept warning
Ganesh Sittampalam <ganesh@earth.li>**20101213191354
 Ignore-this: 56e525fd1fb0c7ae85ddc339afce061d
] =

[Haddock some of Darcs.Patch.Depends.
Eric Kow <kowey@darcs.net>**20101218114634
 Ignore-this: 47ea2ce3e5b6e3d4942c70c7a28721df
] =

[Simplification of commuteFiledir Move:<DP case.
Iago Abal <iago.abal@gmail.com>**20101207184117
 Ignore-this: b25d04d67d5bb09b798e9b1651e215e3
 Note (p2 =3D=3D AddDir || p2 =3D=3D RmDir) is trivially True.
] =

[Simplification of speedyCommute.
Iago Abal <iago.abal@gmail.com>**20101207174520
 Ignore-this: 1ea6d33794b7ea3af5120d930d3eb872
 is_filepatch is not needed since speedyCommute only works with Prim patche=
s.
] =

[re-enable witnesses for the test harness which got lost somehow
Ganesh Sittampalam <ganesh@earth.li>**20101215220059
 Ignore-this: b2da8ffb68383ebbf556024e3a0a435d
] =

[remove Darcs.Repository.Checkpoint
Guillaume Hoffmann <guillaumh@gmail.com>**20101208183913
 Ignore-this: b5a1677fac5727da627dadfedbacb5cb
] =

[remove support for get --partial and check --partial
Guillaume Hoffmann <guillaumh@gmail.com>**20101208183813
 Ignore-this: 2ec94a6fe97474ae2247e6ae92e9d8ac
] =

[remove get --ephemeral support
Guillaume Hoffmann <guillaumh@gmail.com>**20101101101602
 Ignore-this: ba845ea91098dfc9f1afdc53d90c6614
] =

[remove all tests related to checkpoints and --partial
Guillaume Hoffmann <guillaumh@gmail.com>**20101101100324
 Ignore-this: 22862a1eabcd2e2c2659973af21405a0
] =

[break examples out of Darcs.Test.Patch.QuickCheck
Ganesh Sittampalam <ganesh@earth.li>**20101125192333
 Ignore-this: 9611716dcb5bb862f5d97ecbb95c74e9
] =

[decouple Unit and Unit2
Ganesh Sittampalam <ganesh@earth.li>**20101125182301
 Ignore-this: 1bc138c7de49a247bf3400044b46f0f0
] =

[break test cases out of Darcs.Test.Patch
Ganesh Sittampalam <ganesh@earth.li>**20101125181516
 Ignore-this: 145d9ede53c5977da59ce88cc5fe5ec2
] =

[put property test list along with tests
Ganesh Sittampalam <ganesh@earth.li>**20101125180842
 Ignore-this: a3343b193234f7d9f7ae532071733e0a
] =

[reorganise top-level test list
Ganesh Sittampalam <ganesh@earth.li>**20101125075442
 Ignore-this: be3cc209b3a0733ec08607a14acb47d1
] =

[move properties out of Darcs.Test.Patch.Test
Ganesh Sittampalam <ganesh@earth.li>**20101125073109
 Ignore-this: 5288340fccc0d8ed8e17b7cedf395ea
] =

[delete unused and not very useful looking testcase
Ganesh Sittampalam <ganesh@earth.li>**20101125071608
 Ignore-this: ef1fb71f84ddaa93764f6fdca2c24248
] =

[delete unused utility function
Ganesh Sittampalam <ganesh@earth.li>**20101125071356
 Ignore-this: e0cab51985cdf262e13fc599cf0b77a
] =

[remove unneeded warning flag
Ganesh Sittampalam <ganesh@earth.li>**20101125070902
 Ignore-this: 119530d8a4b19162c15e8a9a74d12da5
] =

[delete some commented out stuff
Ganesh Sittampalam <ganesh@earth.li>**20101125065158
 Ignore-this: fd358e149831675daf9283ea6948fdc8
] =

[patch test harness: break out some utility code
Ganesh Sittampalam <ganesh@earth.li>**20101124184750
 Ignore-this: 766e863f6874ebac9c8ff9224410d9d5
] =

[correct character literals
Ganesh Sittampalam <ganesh@earth.li>**20101203220936
 Ignore-this: 19065e2f0ab74d7a0ef104a7f4e36449
] =

[issue1988 cleanups: accept a couple of commutes that just check success
Ganesh Sittampalam <ganesh@earth.li>**20101124180630
 Ignore-this: 2816e3130eea91a8cfa24aa98794c41b
] =

[issue1988 cleanups: accept throwing away PatchCheck results
Ganesh Sittampalam <ganesh@earth.li>**20101124180512
 Ignore-this: f5b4253f581404f69e88114d5f608176
 Also added a comment about improving PatchCheck so this isn't needed.
] =

[issue1988 cleanups: accept throwing away parse results
Ganesh Sittampalam <ganesh@earth.li>**20101124075515
 Ignore-this: 2fd4df8a7172a881e5db351e4a052d87
] =

[correct Darcs.URL.isSshUrl
Florent Becker <florent.becker@ens-lyon.org>**20101130151726
 Ignore-this: f082650648e2a747edf9b251e4e67a03
] =

[Fix inconsistency in documentation on Windows paths.
Eric Kow <kowey@darcs.net>**20101124094339
 Ignore-this: eb1a4700a1bed8676067c523c7f5bad2
] =

[test for behaviour if there is pristine corruption
Ganesh Sittampalam <ganesh@earth.li>**20101123181837
 Ignore-this: 7a66f8e9a87cd90cf77550ee3c1f8a2d
] =

[put commuteNoConflicts into its own class and remove default impl
Ganesh Sittampalam <ganesh@earth.li>**20101123075045
 Ignore-this: 95a95ae81747766f492cfafafeb6604e
] =

[move consistency checking into Darcs.Patch.Repair
Ganesh Sittampalam <ganesh@earth.li>**20101123075044
 Ignore-this: 9d1291af3afc445c1ba00145f918e6b2
] =

[drop an unused instance of Conflict
Ganesh Sittampalam <ganesh@earth.li>**20101123075043
 Ignore-this: da69a17c121332c3ad6b07446910ca76
] =

[remove default for resolveConflicts
Ganesh Sittampalam <ganesh@earth.li>**20101123075041
 Ignore-this: 9004f3ce10fc0bf1680ac45b2918c288
] =

[break patch repair out into its own class
Ganesh Sittampalam <ganesh@earth.li>**20101123075040
 Ignore-this: c60930c90c0740fb88cd29cd99223434
] =

[get rid of unused default implementation for apply
Ganesh Sittampalam <ganesh@earth.li>**20101123075039
 Ignore-this: f1e92c2f2f0bfa4b094eee1c4c78fbda
] =

[remove unused parameter
Ganesh Sittampalam <ganesh@earth.li>**20101123075037
 Ignore-this: b5386a56711d2379fa0ed55bd8b5cf92
] =

[abstract RealPatch over Prim
Ganesh Sittampalam <ganesh@earth.li>**20101123075027
 Ignore-this: c72b1bf5964d70f08b097723bba9fb58
] =

[abstract Patch over prim type
Ganesh Sittampalam <ganesh@earth.li>**20101123074250
 Ignore-this: a745d18c3a97568a7144407a004f1c44
] =

[introduce Dummy patch type
Ganesh Sittampalam <ganesh@earth.li>**20101123074249
 Ignore-this: 20b07c45971f395c42cc8801d39aa0e2
] =

[get rid of unnecessary instances for Prim
Ganesh Sittampalam <ganesh@earth.li>**20101123074247
 Ignore-this: d677b560ab9e9bc74750eabb3e188958
] =

[get rid of Effect instance for Prim
Ganesh Sittampalam <ganesh@earth.li>**20101123074246
 Ignore-this: 61a73d34463be4deafb47d083b51f976
] =

[abstract Prim behind a class
Ganesh Sittampalam <ganesh@earth.li>**20101123074243
 Ignore-this: 57b59798ed3e459640f9d7477f9e5953
] =

[don't go via Patch to summarise changes in record
Ganesh Sittampalam <ganesh@earth.li>**20101123074235
 Ignore-this: 9293d70c0bf818e1d52680bbc975efda
] =

[stop going via V2 patches in WhatsNew
Ganesh Sittampalam <ganesh@earth.li>**20101123074230
 Ignore-this: 32a615f1aa8e266ab5585d8244ff0ec
] =

[make summaries of lists work properly
Ganesh Sittampalam <ganesh@earth.li>**20101123074234
 Ignore-this: 9c82069fea8022bd61b3240b480c14a5
] =

[get rid of Conflict instance for Prim
Ganesh Sittampalam <ganesh@earth.li>**20101123074229
 Ignore-this: 68aa1b393d45f802efaadd3ed275b736
] =

[test that summaries are merged properly in record
Ganesh Sittampalam <ganesh@earth.li>**20101123074233
 Ignore-this: e44955c9a3b12ab7fc1bc41b4e95b0f3
] =

[simplify Effect instances
Ganesh Sittampalam <ganesh@earth.li>**20101123074242
 Ignore-this: 82d766c2858b91b047934092e1fa75ec
] =

[use API function for identity patch
Ganesh Sittampalam <ganesh@earth.li>**20101123074241
 Ignore-this: 8036166db00023e7d52ea734b15c175e
] =

[given token replacement its own module
Ganesh Sittampalam <ganesh@earth.li>**20101123074239
 Ignore-this: ae43c2e291b25ee807ef578fd5298006
] =

[clean up some unused exports
Ganesh Sittampalam <ganesh@earth.li>**20101123074238
 Ignore-this: 6395127883c8e6f9c04f10e59a940f9c
] =

[simplify ShowPatch constraints
Ganesh Sittampalam <ganesh@earth.li>**20101123074237
 Ignore-this: 4a581d574760b90e9a69eeda8898392f
] =

[move Prim instances for Show into Prim.Show
Ganesh Sittampalam <ganesh@earth.li>**20101123074227
 Ignore-this: f55b3e37f27521311dfe9a0912d77d26
] =

[move FileNameFormat out of Prim
Ganesh Sittampalam <ganesh@earth.li>**20101123074202
 Ignore-this: fdd4d868236866af09e910efe9c53504
 Although this is essentially a legacy concept, both Prim and patch types
 that build on Prim need to know about it, so it's cleanest to have it
 somewhere central.
] =

[hide the internals of Prim
Ganesh Sittampalam <ganesh@earth.li>**20101123072741
 Ignore-this: b61471142ab8c2844c512c532e366fa6
] =

[move IsHunk into its own module
Ganesh Sittampalam <ganesh@earth.li>**20101123072723
 Ignore-this: ebd3a12d7e2fabfc1d409e6e46e3a643
] =

[extract Darcs.Patch.Prim.Commute
Ganesh Sittampalam <ganesh@earth.li>**20101123072550
 Ignore-this: 9ab7d0bb8fb07003e80a001ba8d45c6a
] =

[move showPrim etc out of Darcs.Patch.Prim.Core
Ganesh Sittampalam <ganesh@earth.li>**20101123072549
 Ignore-this: df8a6621d14a293e165ec89fc7c252bc
] =

[move coalescing code out of Darcs.Patch.Prim.Core
Ganesh Sittampalam <ganesh@earth.li>**20101123072547
 Ignore-this: 67077bfc067a10d58337d9c81357831c
] =

[move read of Prim into its own module
Ganesh Sittampalam <ganesh@earth.li>**20101123072543
 Ignore-this: 7a1559d95c20d0fdae0f14828413400d
] =

[move Apply Prim code into separate module
Ganesh Sittampalam <ganesh@earth.li>**20101123072331
 Ignore-this: cc5370951c265338f51f83704fd9e79c
] =

[move Population handling out of Darcs.Patch.Apply
Ganesh Sittampalam <ganesh@earth.li>**20101123072329
 Ignore-this: 7ada64cad1204e32a266f2aaf54af224
] =

[abstract Population over PatchInfo
Ganesh Sittampalam <ganesh@earth.li>**20101123072328
 Ignore-this: 375298b05ae167c026c88ed4fa4ee6cd
] =

[give applyFL a better name
Ganesh Sittampalam <ganesh@earth.li>**20101123072327
 Ignore-this: 7fd692a48aed26cb752e097cbc4fb576
] =

[move Darcs.Population[Data] into Darcs.Patch namespace
Ganesh Sittampalam <ganesh@earth.li>**20101123072325
 Ignore-this: 2993f6690963daf1113b2663cff394d
] =

[move markupFile etc out of Darcs.Patch.Apply
Ganesh Sittampalam <ganesh@earth.li>**20101123072324
 Ignore-this: e90687f3a39f06fa2b68da5e1b43b727
] =

[break up Summary so Prim is handled internally
Ganesh Sittampalam <ganesh@earth.li>**20101123072322
 Ignore-this: bd36707c7e733d522237ec7b14c2da95
] =

[abstract MarkedUpFile etc over PatchInfo
Ganesh Sittampalam <ganesh@earth.li>**20101123072316
 Ignore-this: 48cc4ff4d7c2a0b1cdc7b5bea90db100
] =

[remove dead code
Ganesh Sittampalam <ganesh@earth.li>**20101123072306
 Ignore-this: 1ed64d161324b01c3bea241ae814cf09
] =

[split out Darcs.Patch.{Effect,Conflict}
Ganesh Sittampalam <ganesh@earth.li>**20101123072303
 Ignore-this: 17fb8d3d32bc0b76e1acd47f67a7ba56
] =

[split out IsHunk from Effect
Ganesh Sittampalam <ganesh@earth.li>**20101122064320
 Ignore-this: e824b3a7a0c47442e5fb653bd777b633
] =

[get rid of Identity constructor from Prim
Ganesh Sittampalam <ganesh@earth.li>**20101122064315
 Ignore-this: 1067a1ef4b957303b9449774fbaef9ee
] =

[move MyEq superclass from Invert to Patchy
Ganesh Sittampalam <ganesh@earth.li>**20101122064312
 Ignore-this: 52677b5cd1fa8160596af02e70d3880c
] =

[drop identity member of Invert
Ganesh Sittampalam <ganesh@earth.li>**20101122064308
 Ignore-this: ad8007c6d4e63fcf9cd3870892cab247
] =

[read legacy Split patch format
Ganesh Sittampalam <ganesh@earth.li>**20101123070142
 Ignore-this: 3fd0ccf9e668d133bbea222364823b35
 This now gets flattened out at the FL Patch/FL RealPatch level.
] =

[get rid of Split
Ganesh Sittampalam <ganesh@earth.li>**20101122064304
 Ignore-this: 5473000393dab8828eb56f182af20ab5
] =

[add tests for reading of split patches
Ganesh Sittampalam <ganesh@earth.li>**20101122073043
 Ignore-this: bc2cebc9257f2982d15e590351f2d97f
] =

[make Show instance for V2 patches mirror that for V1 patches
Ganesh Sittampalam <ganesh@earth.li>**20101123074231
 Ignore-this: 153d97cd72ada5dd78aba225385708fc
] =

[move guts of Darcs.Patch.Prim into new Core module
Ganesh Sittampalam <ganesh@earth.li>**20101123072318
 Ignore-this: 1df78c83a16a2882c8f6387ee6d7be2d
] =

[get rid of a few more unnecessary superclasses
Ganesh Sittampalam <ganesh@earth.li>**20101122064258
 Ignore-this: fd8480168c63a436c4062a09b8ad374a
] =

[break out Summary code into separate module
Ganesh Sittampalam <ganesh@earth.li>**20101122064255
 Ignore-this: 2ae3db693c769895a9d5659d53af23d8
] =

[disentangle Darcs.Patch.Named from Darcs.Patch.Viewing
Ganesh Sittampalam <ganesh@earth.li>**20101122064253
 Ignore-this: 2406a3b4e7aed4093359a49d3058663f
] =

[Windows paths are not ssh urls
Florent Becker <florent.becker@ens-lyon.org>**20101122153753
 Ignore-this: 6f93c6029c0ff70ea6f98d104c2bc27e
] =

[resolve conflict between withUMaskFromOpts and withGutsOf
Ganesh Sittampalam <ganesh@earth.li>**20101121184642
 Ignore-this: 79cfa7870295f05446a0e73bd68a6104
] =

[Generalize withSignalsBlocked and withGutsOf
Gabriel Kerneis <kerneis@pps.jussieu.fr>**20101104114545
 Ignore-this: f3463a282becba6b6d081de64527df78
] =

[resolve more conflicts with issue332 patch
Ganesh Sittampalam <ganesh@earth.li>**20101121170127
 Ignore-this: 1f22350f8af6b0b20f5c6bb70abc8065
] =

[TAG 2.7.1
Ganesh Sittampalam <ganesh@earth.li>**20110125223233
 Ignore-this: 6c57678d2d270e3a1772f6e48404b02c
] =

[Support hunk editing in rollback
Florent Becker <florent.becker@ens-lyon.org>**20101019170706
 Ignore-this: 45daabc085d1a5afdf8ae25eb354ebc6
] =

[Bump text dependency to 0.11.*.
Eric Kow <kowey@darcs.net>**20110121160426
 Ignore-this: f029df42bf8e6b843c0e74fcdedf6c5c
] =

[Use Data.Text.find instead of findBy.
Eric Kow <kowey@darcs.net>**20110121154052
 Ignore-this: eab8ce1ffa5d0961c5ff15d9a730932f
 It was renamed in text 0.11 (confusingly, prior versions of
 text also had a find function, but it has been withdrawn or
 renamed)
] =

[Test issue1558: xml output for patch hash shall not include "gz" extension
Gabriel Kerneis <kerneis@pps.jussieu.fr>**20101216160034
 Ignore-this: 8437fc7591752265ecd6b5601af7c34f
] =

[resolve issue1558: remove ".gz" extension in xml output
Gabriel Kerneis <kerneis@pps.jussieu.fr>**20101216155428
 Ignore-this: 24a5b7949daf7c662cb2db10cd8909a1
] =

[Split makeFilename to get rid off the .gz suffix
Gabriel Kerneis <kerneis@pps.jussieu.fr>**20101216154647
 Ignore-this: 7efae8d990fe013d1ae0a872faf4b015
] =

[Add GPL version to man page.
Eric Kow <kowey@darcs.net>**20110105174019
 Ignore-this: 8883c282b41bc699eeb8aca6ca4baa98
] =

[Specify GPLv2+ in manual.
Eric Kow <kowey@darcs.net>**20110105173547
 Ignore-this: 19f7d32352828231fc9872afebfe4159
] =

[Use getBoolFlag to check for a packs flag
Alexey Levan <exlevan@gmail.com>**20101122111702
 Ignore-this: 904514279a7cc9a52b0676d3ee811a7a
] =

[Fix check for --packs flag
Alexey Levan <exlevan@gmail.com>**20101105175129
 Ignore-this: ae85523a3f55e32de13d7feea8870716
] =

[Accept issue2017: apply crash when tag missing from context.
Eric Kow <kowey@darcs.net>**20101216122006
 Ignore-this: 90d850a66c5974209ccf56cd00f6de0f
] =

[hunk editing test
Ganesh Sittampalam <ganesh@earth.li>**20110107204059
 Ignore-this: 21a169987f432ed46e879ebfb3101176
] =

[split a basic class out of ShowPatch that requires fewer deps
Ganesh Sittampalam <ganesh@earth.li>**20101122064250
 Ignore-this: aded2f29e3154df418d57f95917534fd
 This allows a bunch of unreachable and duplicated code to be removed
 =

] =

[Friendlier _darcs/inventory HINT message.
Eric Kow <kowey@darcs.net>**20101122115635
 Ignore-this: a6edc02f057b0ccc9d8dabbb47efab9c
 The idea is to focus on concrete actions or expectations, no internals!
] =

[Label the unreachable repository note as a HINT.
Eric Kow <kowey@darcs.net>**20101118171446
 Ignore-this: 81bcf930219eefb3e26f0c925d0cd5e
] =

[Label --set-default note as a HINT.
Eric Kow <kowey@darcs.net>**20101118163634
 Ignore-this: bd878dcbb9ed964041f7ddef0c187856
 =

 The goal is to uniformly mark all non-essential "helpful" prompts
 in a recognisable way.  The underlying message is "relax!"
] =

[fix warning in Darcs.Patch.Split
Ganesh Sittampalam <ganesh@earth.li>**20101121154023
 Ignore-this: 4ba29ad3adebbaaf2051f17c5d4f22a8
] =

[fix warning in Darcs.Patch.Bundle
Ganesh Sittampalam <ganesh@earth.li>**20101121154016
 Ignore-this: 2fc86824ab6c8c9646288e83e235e1ab
] =

[resolve issue114: allow hunk-splitting in revert
Florent Becker <florent.becker@ens-lyon.org>**20101017154131
 Ignore-this: 1d0d0f1643f4d0d3fac27f0442c50805
 The UI is stolen from record-hunk-splitting and therefore subpar. It shoul=
d be checked by native english-speakers and non-programmers.
 =

] =

[resolve issue1978
Florent Becker <florent.becker@ens-lyon.org>**20101030125001
 Ignore-this: bee36780c2ca85778675e280c8aee1ac
] =

[make checkUnrecordedConflicts use the correct patch type for the repo
Ganesh Sittampalam <ganesh@earth.li>**20101122063342
 Ignore-this: 584f48e18763f0bd3c8dc0befc775e53
] =

[Thanks to Summersault for their generous donation!
Eric Kow <kowey@darcs.net>**20101222114837
 Ignore-this: d319ce144217907609b54b27ff8d6bf1
] =

[Resolve import conflict in rollback work and record on test failure.
Eric Kow <kowey@darcs.net>**20101218234518
 Ignore-this: 6c02965428b42df801882b7f0527962a
] =

[Reinstantiate matchingHead
Florent Becker <florent.becker@ens-lyon.org>**20101115135320
 Ignore-this: 2497436bac21702cd51ba210cad5ff41
] =

[Limit unpull and rollback to last tag again
Florent Becker <florent.becker@ens-lyon.org>**20101110112706
 Ignore-this: b5cf8ff1ade5da7e4be70781cc7fc45e
] =

[resolve issue1922: output correct context in darcs unpull -O
Florent Becker <florent.becker@ens-lyon.org>**20101109213633
 Ignore-this: 741866c4a645edc0b43ba889fb4e965c
 =

] =

[exit faster on null selection in Unrecord
Florent Becker <florent.becker@ens-lyon.org>**20101109170408
 Ignore-this: 2bbf93f60e433dc8a0e6d85544b3004d
] =

[test for issue 1922
Florent Becker <florent.becker@ens-lyon.org>**20101115152327
 Ignore-this: 985fcd8af727b5c65ea49a82b89083db
] =

[allow rollback and unpull to work under tags
Florent Becker <florent.becker@ens-lyon.org>**20101109164748
 Ignore-this: 57b8ce407b33fd6dc0e39b0f2d26824c
 =

 Quick preliminary tests seem to work ok performance-wise,
 but obliterate -a is now a very bad idea indeed.
] =

[Update documentation of arbitraryTree.
Iago Abal <iago.abal@gmail.com>**20101207184655
 Ignore-this: 5185788f89b841869cd31538fc6497e9
] =

[Update link to the wiki UnitTests page.
Iago Abal <iago.abal@gmail.com>**20101207171135
 Ignore-this: 5891902745de905077231d3477a2a57a
] =

[Update SFC address.
Eric Kow <kowey@darcs.net>**20101217093303
 Ignore-this: d7f918a0edbcaa1e03434a8210c7aefd
] =

[Don't require --darcs when it's not needed in darcs-test executable
Florent Becker <florent.becker@ens-lyon.org>**20101210160200
 Ignore-this: f9121b902ca53bf234ae2d49ab551f21
] =

[Fix linking with libdarcs under Windows
Alexey Levan <exlevan@gmail.com>**20101211225308
 Ignore-this: 4cabe87f77b5cd12fd317894cc332b63
] =

[simplify readPatch' for Braced
Ganesh Sittampalam <ganesh@earth.li>**20101122063209
 Ignore-this: e2300350b3742b1a8959abe1f7a0abfb
] =

[resolve conflict between patch reading changes and case -> maybe cleanup
Ganesh Sittampalam <ganesh@earth.li>**20101121184659
 Ignore-this: 6545e303932fded4191198b8ea3ca787
] =

[drop the nested Maybes in the patch parser
Ganesh Sittampalam <ganesh@earth.li>**20101022055829
 Ignore-this: 8f14fbf7678212998c27243417d7354e
] =

[drop the unused and often ignored "want eof" parameter to readPatch'
Ganesh Sittampalam <ganesh@earth.li>**20101022055359
 Ignore-this: e5c182dbd908515426c924cc4fd8dc5c
] =

[don't silently throw away remaining parse input
Ganesh Sittampalam <ganesh@earth.li>**20101022054900
 Ignore-this: 7fb9da95e5f439764e4d60f5a366e1d4
] =

[get rid of useless instance
Ganesh Sittampalam <ganesh@earth.li>**20101122062905
 Ignore-this: 6597211f9863149d6278e8cec8897bed
] =

[rename Darcs.Hopefully to Darcs.Patch.PatchInfoAnd
Ganesh Sittampalam <ganesh@earth.li>**20101122062105
 Ignore-this: ee6b4444dec3c021be5514b49379ec51
 The new name much better reflects the role of this module.
 The Hopefully type could in principle be split out back
 into a new Darcs.Hopefully module, but it's unlikely it would
 have any independent value.
] =

[move pending.new reading/writing into Repository.LowLevel
Ganesh Sittampalam <ganesh@earth.li>**20101122061926
 Ignore-this: 7b3cd344ba227271f48f9abd37fea7e4
] =

[Get rid of pointless call to effect in Darcs.Resolution
Ganesh Sittampalam <ganesh@earth.li>**20101122061049
 Ignore-this: c1fbc01b8a34b4438832f3eb6a8a627a
] =

[Remove an unnecessary call to effect in setTentativePending
Ganesh Sittampalam <ganesh@earth.li>**20101122061049
 Ignore-this: 879310667e9fd34728727000f84ccf9c
] =

[More visible old-fashioned to hashed notice.
Eric Kow <kowey@darcs.net>**20100922100010
 Ignore-this: a8ede6ade6aad4e9ae030c36556a488b
 This also talks about old-fashioned as being deprecated.
] =

[move writePatch and gzWritePatch outside ShowPatch
Ganesh Sittampalam <ganesh@earth.li>**20101122064245
 Ignore-this: e3af453f31e0df8e69eaf3964de18471
] =

[get rid of some spurious arguments to impossible
Ganesh Sittampalam <ganesh@earth.li>**20101122062905
 Ignore-this: 6a1a5360549ce4225d01f08912654675
] =

[improve name
Ganesh Sittampalam <ganesh@earth.li>**20101122061806
 Ignore-this: e0ca59264e188375e1961b232d965837
] =

[Darcs.Patch.Apply doesn't have orphans any more
Ganesh Sittampalam <ganesh@earth.li>**20101122061806
 Ignore-this: 1f16110aa0724103970b586885e4bba6
] =

[generalise type of xmlSummary
Ganesh Sittampalam <ganesh@earth.li>**20101122061031
 Ignore-this: 50ff99a323a6573b944e25d710cbb88a
 conflictedEffect for Named has the same behaviour as for the underlying
 patch, so this should have no effect on behaviour
] =

[tighten up type of handlePendForAdd
Ganesh Sittampalam <ganesh@earth.li>**20101122060846
 Ignore-this: bc417d82bd97e62bb3fc6b3f398dec0f
] =

[Tighten up type of applyToWorking
Ganesh Sittampalam <ganesh@earth.li>**20101121153126
 Ignore-this: 79ed2bb5cfb232cf8a44e7ece4ec2e90
] =

[Tighten up type in Darcs.Rollback
Ganesh Sittampalam <ganesh@earth.li>**20101121153125
 Ignore-this: a2b346cb329ae466cdfdb2eb8544101f
] =

[more thorough checks of _darcs/format handling
Florent Becker <florent.becker@ens-lyon.org>**20101017133418
 Ignore-this: 13d9efb1af01b8ed9a24a00e79fc7630
] =

[Test for issue1978
Florent Becker <florent.becker@ens-lyon.org>**20101017133304
 Ignore-this: e9adb647706c5edb378fb76bcb728014
] =

[Restore a missing hyphen from patch191.
Eric Kow <kowey@darcs.net>**20101122145355
 Ignore-this: ba012bf1e2169b1e6b77fe918e24241d
] =

[resolve issue1988: enable warn-unused-do-bind
Gabriel Kerneis <kerneis@pps.jussieu.fr>**20101121211101
 Ignore-this: 1833a27ec8dac960764a6e3ffdbd04e7
 =

 This patch enables warn-unused-do-bind and silences the 163 warnings of
 that kind spread accross darcs code.
 =

 Please note that that this patch has been automatically generated by a
 shell script.  It does not change or break anything, but might silence
 warnings which are actual bugs.
] =

[Explain do-notation comments in README
Gabriel Kerneis <kerneis@pps.jussieu.fr>**20101105101536
 Ignore-this: 1869893336e4b719bf30a4513103d1ec
] =

[update comparisons to other VCS in manual, remove section subsumed by the =
wiki
Guillaume Hoffmann <guillaumh@gmail.com>**20101117140753
 Ignore-this: 1fbbb263f75fa23415ee5732017cb8b9
] =

[update building section of manual, avoid information rot
Guillaume Hoffmann <guillaumh@gmail.com>**20101117135734
 Ignore-this: 38d73b7a971e9d5af973e78471d270d3
] =

[remove the mysterious add --date-trick
Guillaume Hoffmann <guillaumh@gmail.com>**20101117135301
 Ignore-this: fd51f281fb8fcf1393cb69ee59619e87
] =

[resolve issue1637: report HTTP response code for HTTP errors
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101115183345
 Ignore-this: 67fcbd9a0d3466f21a3a045672a12218
] =

[resolve conflict between Darcs.Population cleanup and catMaybes -> mapMayb=
e
Ganesh Sittampalam <ganesh@earth.li>**20101121203847
 Ignore-this: 5ad2139d8a0b809b3f7e70e1cbf8eabb
] =

[remove command optimize --relink-pristine
Guillaume Hoffmann <guillaumh@gmail.com>**20101110092122
 Ignore-this: 53b07384fb2ffbc718424d1ebcb91f47
] =

[haddock for createPartialsPristineDirectoryTree
Guillaume Hoffmann <guillaumh@gmail.com>**20101110090645
 Ignore-this: 5344ce5e9e56b6993e448afc55651977
] =

[in Pristine use bug more and remove unused functions
Guillaume Hoffmann <guillaumh@gmail.com>**20101110085028
 Ignore-this: c86e42e78764924e6ec1fa40d1b5f78
] =

[remove dangling doc paragraph from 2002 in DarcsRepo
Guillaume Hoffmann <guillaumh@gmail.com>**20101110084735
 Ignore-this: db6090517ea15be707531842aa9b8f2b
] =

[unused return value of createPristine
Guillaume Hoffmann <guillaumh@gmail.com>**20101109184733
 Ignore-this: e908f8c3a1d1c4054c7a6547d2931f1
] =

[remove the nopristine function
Guillaume Hoffmann <guillaumh@gmail.com>**20101109163751
 Ignore-this: 6e4f6d981306f250eee5149ee45d51e
] =

[remove unused getRepoPop function
Guillaume Hoffmann <guillaumh@gmail.com>**20101109181844
 Ignore-this: 4fde9b5b6335ddc5a20c5e755fddc240
] =

[tests/emailformat.sh: use ghc --make instead of ghci
Sergei Trofimovich <slyfox@community.haskell.org>**20101116213637
 Ignore-this: 69799051c91b1b7363c1b34328f8c591
 =

 linux-alpha and linux-ia64 don't have ghci support.
 No need to fail there.
] =

[Repository/Internal.hs: invert if to remove negation
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101113220454
 Ignore-this: aaeb1950bf36c7f83af854a45527b7af
] =

[Removed two unneeded returns from Repository/Internal.hs
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101113220049
 Ignore-this: 537e2334b07013b77a1105ab21d50c97
] =

[Minor readProblem-writeProblem refactoring
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101113200557
 Ignore-this: 6b1162780e30051ece99d793d7d7a3d7
] =

[Factor out common parts of readProblem and writeProblem
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101113181857
 Ignore-this: 7ff378de97aaeabbc032ef957bd6d6b2
] =

[Fixed some copypasted comments on xxProblem in Format.hs
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101112062718
 Ignore-this: 3627fffecc8a1bca0692a60c339cada2
] =

[Fixed 'Use when' hlint suggestion where reasonable
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101119230756
 Ignore-this: a50f6bbc7465e801b26180be75ac831f
] =

[Fix 'Use mapMaybe' hlint suggestion everywhere
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101119224821
 Ignore-this: 6eec387b0f79e4a9d58e768f99ae7013
] =

[A couple of maybes instead of cases
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101113225110
 Ignore-this: 872d6a092252de0f09db303702756db6
] =

[Removed an unneeded $
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101113225028
 Ignore-this: bbd673a4df03badb30710dbe73782d1
] =

[Factor out a repeated pattern with getUMask
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101113220558
 Ignore-this: f6bbbf068047638ddc885f1d9b23713a
] =

[flip catch -> handle
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101116205833
 Ignore-this: 46de0341ac033582cc59352db7b92e3e
] =

[Hlintification of Preproc.hs
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101116203134
 Ignore-this: e1f30d03ede340631906d973df055c1
] =

[resolve conflicts in issue332 patch
Ganesh Sittampalam <ganesh@earth.li>**20101121165331
 Ignore-this: c7837424b394363d93c6e5794b2ad5ad
] =

[resolve issue332: ask if test fails
Gabriel Kerneis <kerneis@pps.jussieu.fr>**20101107191955
 Ignore-this: 5d050e2e7716c81efa81010f91f75916
] =

[Darcs.Patch.Bundle.parseBundle: return patches from the bundle and context=
 separately
Florent Becker <florent.becker@ens-lyon.org>**20101105142838
 Ignore-this: 6327c60611887f3b5c72528f706c3963
 =

 This is intended for library users who want to parse .dpatch files, and wi=
ll need to know which patches are in a bundle, and which are in the context=
 if they want to manipulate the patches without the corresponding repo.
] =

[fix warning in Ssh
Ganesh Sittampalam <ganesh@earth.li>**20101121154031
 Ignore-this: be202040fd18de4d4cf28fc65269577a
] =

[fix warning in Darcs.Commands.Move
Ganesh Sittampalam <ganesh@earth.li>**20101121154010
 Ignore-this: cb402d504ae2097c1627c6734cbe8c3b
] =

[fix warning in Darcs.Commands.Dist
Ganesh Sittampalam <ganesh@earth.li>**20101121154001
 Ignore-this: bcdacd46777afa8f26a882d2d801fe87
] =

[fix warning in Darcs.Commands.Changes
Ganesh Sittampalam <ganesh@earth.li>**20101121153939
 Ignore-this: 263f1fb42e1aac4c279a05f1360f88cf
] =

[Bump the shellish dependency to >=3D 0.1.3.
Petr Rockai <me@mornfall.net>**20101027095304
 Ignore-this: f5e30fcd9f087ec8efc6ec5b273dcfd0
] =

[correct showContextPatch documentation
Florent Becker <florent.becker@ens-lyon.org>**20101117194927
 Ignore-this: fedb50bb3fef8024e2f2fe9df9ad78b0
] =

[correct haddock for PartitionFL
Florent Becker <florent.becker@ens-lyon.org>**20101116141756
 Ignore-this: b16f76fd47b5fb0c30f2afa85f020a0a
] =

[document showContextPatch
Florent Becker <florent.becker@ens-lyon.org>**20101112085523
 Ignore-this: f4e661af01ea1fe250fe9314d5f34db
] =

[Remove redundant (:>>) type constructor
Florent Becker <florent.becker@ens-lyon.org>**20101109153626
 Ignore-this: 9dfb6a83354ed8145e0c170507a2d5dd
] =

[Resolve darcs.cabal conflict with branch-2.5.
Eric Kow <kowey@darcs.net>**20101105014442
 Ignore-this: b0121ba3698b2c594b0300801a3389c8
] =

[Fix conflict with darcs 2.5 backport of issue1942 patch.
Eric Kow <kowey@darcs.net>**20101104212654
 Ignore-this: 437e93ac60e1832e1181e41b1cb948d3
] =

[Cope with initial spaces in URLs
Florent Becker <florent.becker@ens-lyon.org>**20101102103147
 Ignore-this: f0d58cb6310ffa08cfd072190f2eaea5
] =

[resolve issue1970: allow ssh:// urls
Florent Becker <florent.becker@ens-lyon.org>**20101101161445
 Ignore-this: 90ada77620504d0e4f1183a401e47da1
] =

[remove useless unsafePerformIO
Florent Becker <florent.becker@ens-lyon.org>**20101101161205
 Ignore-this: c13a931f08355bc9c21a8ab498f2a7e0
] =

[Warn when running cabal test with -fno-test
Florent Becker <florent.becker@ens-lyon.org>**20101111133710
 Ignore-this: 56d24b012e295240da7c5ce73ab112ab
] =

[move optimization setting into a flag
Ganesh Sittampalam <ganesh@earth.li>**20101022181756
 Ignore-this: bbe59a4cf4532ada81878d420d713ee5
 Turning this off is particularly useful during development
] =

[make test harness optional
Ganesh Sittampalam <ganesh@earth.li>**20101020054443
 Ignore-this: b3b2a4c35d93f9fdece096213f0c49
] =

[Resolve conflicts between test harness extensions and cleanups.
Eric Kow <kowey@darcs.net>**20101019235950
 Ignore-this: 91f2ff9f7b2780faeabf1da707da3342
] =

[Split unit tests into Darcs.Patch and miscellaneous ones.
Eric Kow <kowey@darcs.net>**20101019064019
 Ignore-this: 7bdf86843798f9fd78523ef422267a15
] =

[Sweep Darcs.Patch.Info tests into a single suite.
Eric Kow <kowey@darcs.net>**20101018224304
 Ignore-this: 94418d80d9da38b632b1cd2e97834df2
] =

[Sweep Darcs.Email tests into a single suite.
Eric Kow <kowey@darcs.net>**20101018224209
 Ignore-this: e38592d2775769371647732150bec607
] =

[Consolidate unit test running logic into test harness.
Eric Kow <kowey@darcs.net>**20101018222725
 Ignore-this: 4b36bfc587a276c23b75c4dbb44001f5
] =

[Remove literate Haskell from Darcs.Test.Unit.
Eric Kow <kowey@darcs.net>**20101018174915
 Ignore-this: 5931f6d4a47f394bdef9d1c2432e8ad6
] =

[darcs dist doesn't take any arguments
Alexey Levan <exlevan@gmail.com>**20100326142606
 Ignore-this: e262f20a636a80417f65a50a233df200
] =

[Resolve conflicts with Alexey's refactoring of argument handling in diff
Reinier Lamers <tux_rocker@reinier.de>**20101017091857
 Ignore-this: f4d56ab4bc2cf363939d0b14b1b34c6f
 =

 This resolves conflicts with:
 Thu Mar 25 22:26:01 EET 2010  Alexey Levan <exlevan@gmail.com>
   * Separate arguments/repository code in Diff.lhs
] =

[Separate arguments/repository code in Diff.lhs
Alexey Levan <exlevan@gmail.com>**20100325202601
 Ignore-this: cc7716b8d9fdbbda393e48410496532a
] =

[resolve issue1965: Resolve conflicts with argument handling work in move
Reinier Lamers <tux_rocker@reinier.de>**20101017085238
 Ignore-this: 7d12c75a4806cb786d118a3cb64f8904
 =

 This resolves conflicts with:
 Wed Mar 17 00:02:11 EET 2010  Alexey Levan <exlevan@gmail.com>
   * Separate argument handling from repository work in Move.lhs
] =

[Resolve conflicts with Alexey's refactoring of argument handling in annota=
te
Reinier Lamers <tux_rocker@reinier.de>**20101017085117
 Ignore-this: 6620f01ad35ecf5c6147c2bd6f643cc8
 =

 This resolves conflicts with:
 Thu Mar 25 22:25:56 EET 2010  Alexey Levan <exlevan@gmail.com>
   * Separate arguments/repository code in Annotate.lhs
] =

[Separate arguments/repository code in Annotate.lhs
Alexey Levan <exlevan@gmail.com>**20100325202556
 Ignore-this: 2dd9139ee5e3b086564977396877693a
] =

[Resolve conflicts with Alexey's refactoring of argument handling in change=
s
Reinier Lamers <tux_rocker@reinier.de>**20101017082744
 Ignore-this: 778bf98a8dd3356e5b2acc934e187f7a
 =

 This resolves conflicts with:
 Sun Mar 21 00:10:14 EET 2010  Alexey Levan <exlevan@gmail.com>
   * Resolve issue1397: separate arguments/repository code in Changes.lhs
] =

[Resolve conflicts with Alexey's refactoring of argument handling in add
Reinier Lamers <tux_rocker@reinier.de>**20101017082717
 Ignore-this: 8896891037e22f7654c4829092ab4116
 =

 This resolves conflicts with:
 Sun Mar 21 00:10:08 EET 2010  Alexey Levan <exlevan@gmail.com>
   * Separate arguments/repository code in Add.lhs
] =

[Resolve conflicts with Alexey's refactoring of argument handling in amend-=
record
Reinier Lamers <tux_rocker@reinier.de>**20101017082417
 Ignore-this: b3c95e317d2896e8a7194eb27fe74a6
 =

 This resolves conflicts with:
 Sun Mar 21 00:09:44 EET 2010  Alexey Levan <exlevan@gmail.com>
   * Separate arguments/repository code in AmendRecord.lhs
] =

[Resolve conflicts with Alexey's introduction of maybeFixSubPaths
Reinier Lamers <tux_rocker@reinier.de>**20101017081803
 Ignore-this: 99bd3a5763cce57cc8aae0b6ba9997da
 =

 This resolves conflicts with:
 Tue Mar 16 02:38:17 EET 2010  Alexey Levan <exlevan@gmail.com>
   * Add Maybe variant of fixSubPaths
] =

[Resolve issue1397: separate arguments/repository code in Changes.lhs
Alexey Levan <exlevan@gmail.com>**20100320221014
 Ignore-this: 313b379282f1a40848fad859f3f210c8
] =

[Separate arguments/repository code in Add.lhs
Alexey Levan <exlevan@gmail.com>**20100320221008
 Ignore-this: 2c2b0c30ebe6287c411fee644397c7d8
] =

[Separate arguments/repository code in AmendRecord.lhs
Alexey Levan <exlevan@gmail.com>**20100320220944
 Ignore-this: ef083aaf623a5a8a2bc149b1b75389ef
] =

[Add test for absolute paths
Alexey Levan <exlevan@gmail.com>**20100320212853
 Ignore-this: 4b5865aabc2a30babbb2527aa4463bb0
] =

[Separate argument handling from repository work in Move.lhs
Alexey Levan <exlevan@gmail.com>**20100316220211
 Ignore-this: 943df71030537643bf3b2dc0a3b16bce
] =

[Add Maybe variant of fixSubPaths
Alexey Levan <exlevan@gmail.com>**20100316003817
 Ignore-this: 5fbd7cb6c9e3d61b6922e9990d835752
] =

[Put back showHexLen into Darcs.Utils, it's needed on windows.
Petr Rockai <me@mornfall.net>**20101118164545
 Ignore-this: 7e5fc87887c2b3fae0a99b2846652068
] =

[Disable unsupported haddock.
Eric Kow <kowey@darcs.net>**20101116140631
 Ignore-this: 28e66f7fb0ad5852eb4acda9244db5fb
 =

 See http://trac.haskell.org/haddock/ticket/43
] =

[Fix Darcs.Repository haddock.
Eric Kow <kowey@darcs.net>**20101116140236
 Ignore-this: 4ecf7457ae793af84648e90718119822
] =

[make sure all of Darcs.Patch is imported with explicit import lists
Ganesh Sittampalam <ganesh@earth.li>**20101017115317
 Ignore-this: 607bb79a401039d8219dd0f26b3f4286
] =

[explicit import of Darcs.Test.Patch.Test
Ganesh Sittampalam <ganesh@earth.li>**20101017114148
 Ignore-this: 978dee1e6d68b890eef78f2bdfdf8f7f
] =

[Make send-output-v*.sh tests more robust against timezones
Florent Becker <florent.becker@ens-lyon.org>**20101114122515
 Ignore-this: 7bf4cf4b8a609ec238196d0f5197c533
] =

[fix regressions in V1 patch reading/hash recalc
Ganesh Sittampalam <ganesh@earth.li>**20101021180003
 Ignore-this: d617c585f9b8876a78fb76503fe5d2de
] =

[push FL from Repository instances into Named
Ganesh Sittampalam <ganesh@earth.li>**20101021064310
 Ignore-this: e3f8617187a33dd6ccb910e4ceaabc0e
] =

[remove locale sensitivity from send output tests
Ganesh Sittampalam <ganesh@earth.li>**20101022204106
 Ignore-this: beab482dc602183252cadb5c3c94b9ae
] =

[make send output tests for v2 repos
Ganesh Sittampalam <ganesh@earth.li>**20101021175846
 Ignore-this: f1c9257ea13b0585d83b60eaa9afc8f9
] =

[add test of send adding context around hunks
Ganesh Sittampalam <ganesh@earth.li>**20101021174043
 Ignore-this: 508d152d1ce23b866885cbad4e811663
] =

[get rid of unneeded pragma
Ganesh Sittampalam <ganesh@earth.li>**20101021171149
 Ignore-this: d76997ef4e2adadc566c6f7211f962cd
] =

[showContextPatch FL needs to manage braces too
Ganesh Sittampalam <ganesh@earth.li>**20101020065658
 Ignore-this: d08f9b53a816be198e9c90fdc0c33c7c
] =

[add test of V1 send output
Ganesh Sittampalam <ganesh@earth.li>**20101020061801
 Ignore-this: eb24001122a01689ca0254ca7825e9ae
] =

[add test for handling of v1 patches with nested braces
Ganesh Sittampalam <ganesh@earth.li>**20101019052236
 Ignore-this: 5a0a8a0cddeff383c7535f1296403906
] =

[get rid of ComP
Ganesh Sittampalam <ganesh@earth.li>**20101017104056
 Ignore-this: c686d65fa84305811176862631332f7f
 This makes the treatment of v1 and v2 patches more consistent.
 =

] =

[stop using Patch instances for reading/writing pending
Ganesh Sittampalam <ganesh@earth.li>**20101014202717
 Ignore-this: 3a759059141166a649e6dbfbe2f2f0d8
] =

[Clean up pending API a bit
Ganesh Sittampalam <ganesh@earth.li>**20101014174838
 Ignore-this: c07717f1b71ad3619374faab86352f11
] =

[relax type of bracketedFL
Ganesh Sittampalam <ganesh@earth.li>**20101014174748
 Ignore-this: 8e4777b40518f2ab8a254af9a1cb2fae
] =

[simplify showContextHunk
Ganesh Sittampalam <ganesh@earth.li>**20101014060330
 Ignore-this: 8a0d3ace95df59a65b7e3817b42e6d8a
] =

[replace contents of HACKING with a link to the relevant wiki page
Guillaume Hoffmann <guillaumh@gmail.com>**20101108205514
 Ignore-this: e999e8fc7d46f573cf0114ad2ae4f42a
] =

[make test for issue1465 not spawn real editors
Florent Becker <florent.becker@ens-lyon.org>**20101021152008
 Ignore-this: e7396b0c7e4d65325b8309f68a1fff63
 This is annoying because emacs < /dev/null does not fail, but can spawn a
 (XWindow) emacs
] =

[Make issue1465 test a bit more straightforward.
Eric Kow <kowey@darcs.net>**20101020172422
 Ignore-this: 1b1ab977520178812259492d0ea7d49d
] =

[Resolve issue1551: only use unchanged file content prompt in darcs send.
Eric Kow <kowey@darcs.net>**20100718093448
 Ignore-this: 61cc0bf71ff2c54311834624b2a7f6d7
] =

[Hlintification of Prefs.lhs
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101110201252
 Ignore-this: b5beef14ff46267c2a5adcbab3378cce
] =

[Hlintification of Utils.hs
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101110200114
 Ignore-this: 56b5689f6ab2eb9da5bd46501ef77979
] =

[Hlintification of Format.hs
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101110200018
 Ignore-this: 8ac835d3a4c9c4d3428bbc87ef2cc407
] =

[Changed comment on Progress.hs - was a copypaste from elsewhere
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101107011449
 Ignore-this: 13c848a420163106f0e494ec8f4c5f34
] =

[Removed putTiming duplication
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101107003416
 Ignore-this: 2f28a06914621d8229e9a1e7dcbe46b2
] =

[Removed an extra return
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101106224143
 Ignore-this: c6142e31820d363068257b4add610a0d
] =

[Hlintification of SetPref.lhs
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101110221559
 Ignore-this: d2e25d6bd95e37cd69c10fb10a31dd31
] =

[Hlintification of Lcs.hs
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101110213312
 Ignore-this: dc1697b4e7e68bb6a4c35c1b95da738d
] =

[add some explicit export lists in Darcs.Commands
Ganesh Sittampalam <ganesh@earth.li>**20101017114405
 Ignore-this: c53d2cf0b87d264b2c499f40d0f5904
] =

[explicit import list from Printer
Ganesh Sittampalam <ganesh@earth.li>**20101017114403
 Ignore-this: 8138405f3bfd08eb08b21564e7bb0819
] =

[drop some dead exports/code from ByteStringUtils
Ganesh Sittampalam <ganesh@earth.li>**20101017114402
 Ignore-this: e6504f5e3089c187873a6d05884961e7
] =

[remove some dead code in Darcs.Repository
Ganesh Sittampalam <ganesh@earth.li>**20101017114358
 Ignore-this: e99978a06aa0974d5280fd95d28f855a
] =

[explicit exports/imports for Darcs.Repository.Merge
Ganesh Sittampalam <ganesh@earth.li>**20101017114055
 Ignore-this: 58a34ced75aee0f94214cf998908fd18
] =

[drop unused flag
Ganesh Sittampalam <ganesh@earth.li>**20101017114053
 Ignore-this: 14b73b60b0073ea866d27cfbc462d227
] =

[remove dead code from Darcs.Utils
Ganesh Sittampalam <ganesh@earth.li>**20101017114050
 Ignore-this: 3583c35af9b21b1d1728b845c7345464
] =

[clean up some dead code in Darcs.Patch
Ganesh Sittampalam <ganesh@earth.li>**20101017113941
 Ignore-this: f19209e04d2e453e008e081e0d06dbe
] =

[drop unused verboseMode global
Ganesh Sittampalam <ganesh@earth.li>**20101017113325
 Ignore-this: a61509fac2005025afb601ccb67d929e
] =

[remove unused exports
Ganesh Sittampalam <ganesh@earth.li>**20101017113320
 Ignore-this: 15eab75d0e275a670f2d8d8f4c97aec5
] =

[Add visual emphasys to note about --set-default flag
Alexey Levan <exlevan@gmail.com>**20101105182858
 Ignore-this: 23631abfc8134496d49bdd86dd797d9
] =

[resolve issue1977 by considering more repositories as being NoPristine
Guillaume Hoffmann <guillaumh@gmail.com>**20101017153235
 Ignore-this: 41987c65face6b464951509e4eeda1f2
] =

[accept issue1977
Guillaume Hoffmann <guillaumh@gmail.com>**20101017153230
 Ignore-this: d49bd9d8948ec25c1d57c0b6f4f28aa6
] =

[redundant use of when inside of an else
Guillaume Hoffmann <guillaumh@gmail.com>**20101017145323
 Ignore-this: 31a88e4758b7488abf6a024bf3f707dd
] =

[resolve issue1984: better error message for 'darcs convert'
Dmitry Tsygankov <dmitry.tsygankov@gmail.com>**20101024090802
 Ignore-this: 1e1112dba335510460cffd8c377fe776
] =

[Resolve issue1266: add a warning about nested repositories
Alexey Levan <exlevan@gmail.com>**20101015175449
 Ignore-this: f4fdcf0e2d2b46a82da6cee22e945e30
] =

[Improve issue1465 test (portability, tidiness).
Eric Kow <kowey@darcs.net>**20101020141627
 Ignore-this: e03f16db3f8b333ebed783feb67f2f3e
 =

 - No env -u on MacOS X.
 - No need to clean up directories (new harness)
   Keeping them around makes debugging easier.
] =

[Require absolute path for darcs-test --darcs.
Eric Kow <kowey@darcs.net>**20101017150041
 Ignore-this: 11d3683050c5bd91699b472df93f6726
] =

[Avoid 'Defined but not used' error in darcs-test.
Eric Kow <kowey@darcs.net>**20101017142326
 Ignore-this: 22c7a63806806ea3c82cdd67f65f0596
 We can always rename the field if we actually use it.
] =

[Avoid accidentally running darcs-test on installed darcs.
Eric Kow <kowey@darcs.net>**20101017142317
 Ignore-this: 986cef89265171a3415f155fe4e74260
] =

[Optional --test-dir for darcs-test (for troubleshooting failed tests).
Eric Kow <kowey@darcs.net>**20101017140509
 Ignore-this: b9a976a1ba46f7b5dced6d33c010161a
 This is so you can look at test directory to figure out what went wrong.
] =

[Tidier announcement for subcommute unit tests.
Eric Kow <kowey@darcs.net>**20101018224015
 Ignore-this: 93628ba5160abf8470fb4e2c8d558653
] =

[Mark sections in test.hs.
Eric Kow <kowey@darcs.net>**20101018141559
 Ignore-this: c6246caab473ef215d903ba9dec20f84
] =

[make progress message in pull less silly looking
Florent Becker <florent.becker@ens-lyon.org>**20101017085226
 Ignore-this: 1089079298edeefb4aec9b536479cdcf
] =

[Re-conditionalise setEnvCautiously
Ganesh Sittampalam <ganesh@earth.li>**20101101065509
 Ignore-this: 6028944a9afd6b88b17c1ba219dbd83d
 rolling back:
 =

 Fri Oct  1 23:01:49 BST 2010  Simon Michael <simon@joyful.com>
   * hook env vars: clarify some conditional code
] =

[hook env vars: rename defineChanges/definePatches for clarity
Simon Michael <simon@joyful.com>**20101001225602
 Ignore-this: 28932a8613aa5785f9e4cd48ff004f6b
] =

[hook env vars: clarify some conditional code
Simon Michael <simon@joyful.com>**20101001220149
 Ignore-this: 950ea31d46c94c3cb9df8905c3e86503
] =

[convert.sh should not be reserved to subjects of Her Majesty
Florent Becker <florent.becker@ens-lyon.org>**20101021154510
 Ignore-this: b05c95d5ddba4b2fda5be0ded6a99bb6
] =

[resolve issue1809: don't call modernizePatch during conversion
Ganesh Sittampalam <ganesh@earth.li>**20101016224848
 Ignore-this: 884eedd93a6718c791494c995eedcc03
 =

 The call to modernizePatch was introduced to fix issue744, but:
 (a) It seems to have been ineffective as it's only called for
 patches where isMerger is true, so none of the patch transformations
 can kick in.
 (b) It had the apparently unwanted side-effect of completely disabling
 any attempts to convert mergers into conflictors.
 =

 This patch reverts that, and adds some test material for the
 'darcs convert' command.
 =

] =

[resolve issue734: --set-scripts-executable for "darcs dist"
Gabriel Kerneis <kerneis@pps.jussieu.fr>**20101025110843
 Ignore-this: 15671e02277c10f4421b47378469b0a4
] =

[Add darcs 2.5 to website
Reinier Lamers <tux_rocker@reinier.de>**20101030115320
 Ignore-this: cd39e81cea002cdba709a04c7828c5cd
] =

[Fix harness.sh to also work on windows.
me@mornfall.net**20101027060706
 Ignore-this: 38cc37396c1294004de3c6300f7c3a52
] =

[Avoid mkdir test, seems to throw off windows.
me@mornfall.net**20101026205710
 Ignore-this: 6cea275b1aaa40bd94ca85a8e0a4c5db
] =

[Do not use tar -f, it breaks on windows.
me@mornfall.net**20101026205439
 Ignore-this: ebec7d5abd3948afacb290615930f21c
] =

[Add missing FFI to LANGUAGE pragmas in some .hsc files.
me@mornfall.net**20101026145128
 Ignore-this: 416af8f30a62d0cc89b51e903c6e4874
] =

[Fix build when the HTTP library is not available.
Petr Rockai <me@mornfall.net>**20101027094301
 Ignore-this: e0b5a3b815b0a3e2052b065c9101febf
] =

[Fix patch382: darcs show tags --repo.
Eric Kow <kowey@darcs.net>**20101018070006
 Ignore-this: 4cef691d6e2323f2c0820525feb062c3
 I had fooled myself by using http://darcs.net for informal
 testing when I also happened to darcs darcs repository.
] =

[darcs show tags --repo (instead of --repodir).
Eric Kow <kowey@darcs.net>**20100902104617
 Ignore-this: a258af0eb61f753b5988aae26145ee4c
] =

[build test harness with witnesses and drop separate build
Ganesh Sittampalam <ganesh@earth.li>**20101008213021
 Ignore-this: 43f5c9d14b038943c43cfd1ab74da6a0
] =

[add witnesses to Darcs.Test.Unit
Ganesh Sittampalam <ganesh@earth.li>**20101008213020
 Ignore-this: a32d47872418179e97aa53193d66acc
] =

[add witnesses to Darcs.Test.Patch.Unit
Ganesh Sittampalam <ganesh@earth.li>**20101008213014
 Ignore-this: 75ffb5781fecbce1bc4030d93509feb1
] =

[add witnesses to Darcs.Test.Patch.Unit2
Ganesh Sittampalam <ganesh@earth.li>**20101008172329
 Ignore-this: 878ed3be4ac86200edc0652f4c60e878
] =

[abstract out functions with restricted types
Ganesh Sittampalam <ganesh@earth.li>**20101008172052
 Ignore-this: eea7af82d71d97582a9d943399e2003a
] =

[break Darcs.Test.Patch.Unit up to facilitate witnessing
Ganesh Sittampalam <ganesh@earth.li>**20101008165851
 Ignore-this: b1996c62251999a3d3a3bd847cea1319
] =

[add witnesses to Darcs.Test.Patch.Test
Ganesh Sittampalam <ganesh@earth.li>**20101004172617
 Ignore-this: c41b79266788e3997125871b440c938b
] =

[fix warnings
Ganesh Sittampalam <ganesh@earth.li>**20101004165056
 Ignore-this: ae51af7f567c9d66fa06a6635dadaf23
] =

[get rid of some unused instances
Ganesh Sittampalam <ganesh@earth.li>**20101004165055
 Ignore-this: da31e64d2bc5dcd4603755873ddf272f
] =

[fold simpleSmartMerge/smartMerge consistency checks into property
Ganesh Sittampalam <ganesh@earth.li>**20101004165053
 Ignore-this: d77d99d601c0b934625103771b5bb44b
] =

[re-enable simpleSmartMerge test
Ganesh Sittampalam <ganesh@earth.li>**20101004165052
 Ignore-this: 949961ef6981b6c1e6791fff1ba5788e
] =

[get rid of elegantMerge test
Ganesh Sittampalam <ganesh@earth.li>**20101004165051
 Ignore-this: a9447d91ec992e9ad780b48c0f034441
 Comparing the code, this test is equivalent to propSimpleSmartMergeGoodEno=
ugh
] =

[Show instance for RL
Ganesh Sittampalam <ganesh@earth.li>**20101017084445
 Ignore-this: 7a6517066d63e6a41246e260098f69a2
] =

[fix a sed regexp in hidden_conflicts2.sh
Guillaume Hoffmann <guillaumh@gmail.com>**20101009101652
 Ignore-this: 82c80480a59ff0756a298faac49f97de
] =

[simplify smartMerge/simpleSmartMerge
Ganesh Sittampalam <ganesh@earth.li>**20101004165048
 Ignore-this: 376e9c595aaa8a62fb89a19e9d5f70cd
 They were redundantly returning one of their inputs
] =

[Add flag for using repository packs
Alexey Levan <exlevan@gmail.com>**20101009120209
 Ignore-this: d34ce6d1933bdc948c1ced149b51e212
] =

[Use custom HTTP request for fetchFileLazyPS
Alexey Levan <exlevan@gmail.com>**20101009111021
 Ignore-this: 7aceb99dd48936d9746ec63f56ba1196
] =

[Moved inventories to patches tarball
Alexey Levan <exlevan@gmail.com>**20101009095453
 Ignore-this: 664bc39763346e53376b83a034961532
] =

[Make gzipped inventories parse correctly in readInventoryPrivate
Alexey Levan <exlevan@gmail.com>**20101009091640
 Ignore-this: 82c537eedd9903dda4ee242a9bc48e9e
] =

[Improve getting of packed repositories
Alexey Levan <exlevan@gmail.com>**20101006043345
 Ignore-this: d033c64936164158d04380a6a6bf97af
] =

[Remove warnings about name shadowing
Alexey Levan <exlevan@gmail.com>**20101006043035
 Ignore-this: 2e49caec18292bf68edb5f3c33e1f52b
] =

[Perform cleanup on exceptions in doOptimizeHTTP
Alexey Levan <exlevan@gmail.com>**20101006033620
 Ignore-this: 8971cdbe1f1a8de2b65ae6a6be099e52
] =

[Replace tmp- prefixes with meta- in packs
Alexey Levan <exlevan@gmail.com>**20100819210355
 Ignore-this: 8edfd369978216575a9a1ec4318076cc
] =

[get rid of some joinPatches calls
Ganesh Sittampalam <ganesh@earth.li>**20101006060156
 Ignore-this: f56690f2452daf8394144d56f034ef62
] =

[move conflict marking out into separate module
Ganesh Sittampalam <ganesh@earth.li>**20101005170326
 Ignore-this: f361d691d22da1100e5ac2c9c5c9332
] =

[remove unused export
Ganesh Sittampalam <ganesh@earth.li>**20101005170316
 Ignore-this: 52812eba5de07170338aec8558879d69
] =

[update some comments
Ganesh Sittampalam <ganesh@earth.li>**20101004165058
 Ignore-this: 26e5afa7a519419e3c4685d6d6f9ff91
] =

[replace some unexpected cases with failure
Ganesh Sittampalam <ganesh@earth.li>**20101004165049
 Ignore-this: 7c3c50e2c75446e71b77e2bac639efed
] =

[fail in branch that should be unreachable
Ganesh Sittampalam <ganesh@earth.li>**20101004165045
 Ignore-this: 2a51d5aeec25269134a8a00dff28678f
] =

[drop unused Eq instance for FL
Ganesh Sittampalam <ganesh@earth.li>**20101004165035
 Ignore-this: 56fdad0ab03ebf68087fa9f96d525ab6
] =

[get rid of some joinPatches calls
Ganesh Sittampalam <ganesh@earth.li>**20101004165015
 Ignore-this: 2abc3f82de23f2e34cebf4c1f1e5c91d
] =

[Move some Eq/Show instances to where they belong
Ganesh Sittampalam <ganesh@earth.li>**20101001212122
 Ignore-this: 7740b3a54b3e4d9b991d6e152b88731d
 This also means we can disable OverlappingInstances
] =

[fix off-by-one error with Hunk patches in QuickCheck tests
Ganesh Sittampalam <ganesh@earth.li>**20100908060423
 Ignore-this: 4f126758b77fc07a5734e45226e2cf07
 It turns out the offsets are 1-based, not 0-based.
] =

[Document _darcs/prefs/boring and include in manpage.
Eric Kow <kowey@darcs.net>**20100925071142
 Ignore-this: c8ec96820c0762465d85d88bcce013e4
] =

[get rid of commas in extension specifications
Ganesh Sittampalam <ganesh@earth.li>**20101005061931
 Ignore-this: a1bd0b4078eb61ac4daa4c078cf5a7bd
] =

[clean up use of language extensions
Ganesh Sittampalam <ganesh@earth.li>**20101005061744
 Ignore-this: cc4cc485262c5e076329cf7064a09373
  - minimise set declared in .cabal file
  - make them consistent across all builds
] =

[introduce type class for checkAPatch
Ganesh Sittampalam <ganesh@earth.li>**20101004165015
 Ignore-this: 291aa2e83f44b4ef2718b8ef536dab71
] =

[change hang into error when bad hunk encountered during resolution
Ganesh Sittampalam <ganesh@earth.li>**20100908060245
 Ignore-this: 96b98588b54e20f228bbd9817d91a9ab
] =

[include old text in conflict marks
Ganesh Sittampalam <ganesh@earth.li>**20100908054609
 Ignore-this: 42aa3a9f115baef85d427f801f3a5846
] =

[Resolve issue182: hidden darcs status alias for darcs whatsnew -ls
Eric Kow <kowey@darcs.net>**20100915210519
 Ignore-this: 9ada08c78ea6e877083b56136ad46fd4
] =

[Test for issue1923.
Eric Kow <kowey@darcs.net>**20101018132251
 Ignore-this: 329356a1e357cac6acfeab8ff0fcf28a
] =

[Solve issue1923: cache mechanism warns about sources outside your control
Adolfo Builes <builes.adolfo@googlemail.com>**20100917210653
 Ignore-this: f1d720340b3ff8506c1501c11303ed5a
] =

[Resolve issue1948: send BTS update emails as noreply@
Eric Kow <kowey@darcs.net>**20101016141307
 Ignore-this: 611b31a8670a97f95084b8d8a2f19e21
 =

 1. This avoids confusion from pretending to be somebody we are not
    (the patch author)
 2. This allows roundup to detect emails from BTS/darcs integration
    (because they would all come from a single email address).
] =

[Distinguish between --context with and without arguments.
Eric Kow <kowey@darcs.net>**20100829095904
 Ignore-this: 1e97df10d8c2bbc890946c4d524916aa
 =

 * darcs changes --context means just "output in the context format"
 * darcs {get,send} --context=3Dfoo means get/send via context file foo
] =

[hook env vars: haddock improvement
Simon Michael <simon@joyful.com>**20101001232909
 Ignore-this: bbef4feba5977b66087f30edca207d52
] =

[hook env vars: add some haddocks
Simon Michael <simon@joyful.com>**20101001215802
 Ignore-this: 2b0c8e28f9ff61794bc3805bf424965e
] =

[Remove misleading debug output.
Eric Kow <kowey@darcs.net>**20101001113217
 Ignore-this: e5ce49b082c47eef6c2b6f8021e70e9
 =

 This debug output seems to only indicate that it succesfully *started* the
 download, which is confusing because the download itself could fail.
] =

[clean up OPTIONS_GHC usage
Ganesh Sittampalam <ganesh@earth.li>**20101001203601
 Ignore-this: e001b3d26eb211c07540f9328600061a
 no more -cpp or -fglasgow-exts
] =

[fix warning about tab character
Ganesh Sittampalam <ganesh@earth.li>**20101005061826
 Ignore-this: 20624e31fe2010755874ff7b4c7ab450
] =

[require regex-posix >=3D 0.94.4 on windows to avoid link errors with with =
HP 2010.2.0.0
Simon Michael <simon@joyful.com>**20100914205831
 Ignore-this: eb8b4dd8f6f77bd4014269dc8ca8ecdf
 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).
] =

[Improve error message when _darcs/inventory fallback check fails.
Eric Kow <kowey@darcs.net>**20100909194255
 Ignore-this: c517f37cc1e05c05eef5295607f8b98a
 =

 One thing that can happen is permissions problems on hashed repositories
 which makes darcs unable to read _darcs/format and therefore assume the
 remote repository is old-fashioned.  This extended explanation tries to
 avoid confusing users.  Thanks to Brent Yorgey for help with wording.
] =

[HLint: use notElem.
Eric Kow <kowey@darcs.net>**20100915121147
 Ignore-this: 3a218017c728412293bada9ce5b9ed70
] =

[Haddock confusing naming for lastWord.
Eric Kow <kowey@darcs.net>**20100915105518
 Ignore-this: 9a4c047949f456bac34ff279040de458
] =

[write out tag before trying to optimize inventory
Ganesh Sittampalam <ganesh@earth.li>**20101004054713
 Ignore-this: aebf3d7ace08cce188501432653fd2b7
 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 unsea=
ling.
    (manually backpopting fix by Petr Rockai to mainline)
 =

] =

[More explicit punctuation to avoid ambiguity.
Eric Kow <kowey@darcs.net>**20100925093819
 Ignore-this: ad2be70e6186f37f7e7c1234df0b89aa
] =

[Update Makefile target for patch theory doc.
Eric Kow <kowey@darcs.net>**20100925093745
 Ignore-this: 41efecc9e14fabc8263c25d98135de04
] =

[Add commandProgramName field to DarcsCommand
Joachim Breitner <mail@joachim-breitner.de>**20100916180643
 Ignore-this: 1200c9b51be2aa638b486f0f339521fe
 In order to make the command handling more generic, the name of the progra=
m
 (the executable) is now a field of DarcsCommand. It is used by the functio=
ns
 which generate the help output.
] =

[Avoid issue1599 timeout for people behind proxy servers.
Eric Kow <kowey@darcs.net>**20100917130901
 Ignore-this: 88c48d5de2378a034fb8c9d010a7513a
] =

[Tidy up issue1599 test a tiny bit.
Eric Kow <kowey@darcs.net>**20100917130515
 Ignore-this: a429b44681ec77091e196bfad9d44ccb
] =

[cut witnesses build down
Ganesh Sittampalam <ganesh@earth.li>**20100908060124
 Ignore-this: e392234f8b1a562abd457fdfce8b2424
 The library is now built with witnesses anyway so only the tests
 need a separate build check.
] =

[Tidy up test harness warnings.
Eric Kow <kowey@darcs.net>**20100901134549
 Ignore-this: 136031c756fcae2a7cd1f76a5ec8b214
] =

[Mark ssh test as skipped if REMOTE is not set.
Eric Kow <kowey@darcs.net>**20100913094132
 Ignore-this: 58bd7bcc4dde75c9cf8131d3884bea26
] =

[Move external and ssh tests to network directory.
Eric Kow <kowey@darcs.net>**20100913094048
 Ignore-this: 961d6ac87c91bdfb8d4dc64c84afd643
] =

[Make the tests a bit less verbose (do not print all of lib every time).
Petr Rockai <me@mornfall.net>**20100829171501
 Ignore-this: 860df38824bc5fad37cc583ca893a6c9
] =

[Set a $format variable in lib, depending on current repo format under test=
.
Petr Rockai <me@mornfall.net>**20100829171428
 Ignore-this: eb53b469e40a6f0faa0da5a3d3071d06
] =

[Resolve yet another darcs.cabal conflict.
Petr Rockai <me@mornfall.net>**20100903210833
 Ignore-this: bc94980dc25b0ef8c6600777efc6342
] =

[drop unnecessary import
Ganesh Sittampalam <ganesh@earth.li>**20100828112556
 Ignore-this: a198ddfe3a7def52aa43e295250cde92
] =

[move Darcs.Patch.Properties to Darcs.Test.Patch.Properties
Ganesh Sittampalam <ganesh@earth.li>**20100828112259
 Ignore-this: 6f227d2693c0cfe2549dfc301100200e
] =

[break up Darcs.Patch.Patchy and make Darcs.Patch.Named more self-contained
Ganesh Sittampalam <ganesh@earth.li>**20100828111250
 Ignore-this: 45d8c2abee1e658e4041cff3f32bf922
 Move class definitions out into their own modules and turn
 Darcs.Patch.Patchy into a simple aggregator.
 Move instances for Named into Darcs.Patch.Named.
 =

] =

[drop unnecessary import
Ganesh Sittampalam <ganesh@earth.li>**20100828110105
 Ignore-this: 9afd40118fd5da714a365b001d977c18
] =

[drop unnecessary superclass
Ganesh Sittampalam <ganesh@earth.li>**20100828105847
 Ignore-this: 29b529d355f3f7fc4709782bd489fa34
] =

[fix warning in Darcs.Test.Email
Ganesh Sittampalam <ganesh@earth.li>**20100828104854
 Ignore-this: a3b968e226c34dd01a9770057ac53b35
] =

[fix warning in Darcs.Test.Patch.Info
Ganesh Sittampalam <ganesh@earth.li>**20100828104840
 Ignore-this: ee3565a554c6c95816be43881e3ff5b7
] =

[drop unnecessary constraint
Ganesh Sittampalam <ganesh@earth.li>**20100828104820
 Ignore-this: 3c112ec10a04e2bad52ac8f7e40b048d
] =

[remove commented out imports
Ganesh Sittampalam <ganesh@earth.li>**20100828104810
 Ignore-this: ed972c121c776729076b2160a5d25cc8
] =

[remove unnecessary pragmas from Darcs.Patch.Match
Ganesh Sittampalam <ganesh@earth.li>**20100828104756
 Ignore-this: a422eb1d3b00eb1832b72960df715b14
] =

[remove unused import
Ganesh Sittampalam <ganesh@earth.li>**20100907052616
 Ignore-this: e6398221e0999dfaa6321c04423af94a
] =

[Fix misleading configuration documentation.
Eric Kow <kowey@darcs.net>**20100907194732
 Ignore-this: cad1574acb861504531ad8cd79048296
 It accidentally looked like it was saying ~/.darcs was a Windows setting.
] =

[Accept issue1932: darcs add -qr . should not fail on filenames with ':'
Dmitry Astapov <dastapov@gmail.com>**20100825172835
 Ignore-this: 24884784919f455a8f9b98dea2d750bf
] =

[Document Darcs.Patch.Info.makeFilename.
Eric Kow <kowey@darcs.net>**20100904103153
 Ignore-this: 4eb3f6f8e3dab9b1f6b8fda47c1dd3
] =

[add some haddock to Darcs.Witnesses.Eq
Ganesh Sittampalam <ganesh@earth.li>**20100903181255
 Ignore-this: d74343eb72dacfb027f7c83b8a312eb2
] =

[drop unused concatReverseFL
Ganesh Sittampalam <ganesh@earth.li>**20100903180019
 Ignore-this: 955da64a50d9bc2a248e614d73ee952c
] =

[drop unused headRL
Ganesh Sittampalam <ganesh@earth.li>**20100903175722
 Ignore-this: f574211dbac23a64e727bb00242ee5c3
] =

[drop unsafeMap_l2f
Ganesh Sittampalam <ganesh@earth.li>**20100903174855
 Ignore-this: 6f959a0ffe12580fe38ddd35efc6d703
] =

[drop unused filterE/Proof
Ganesh Sittampalam <ganesh@earth.li>**20100903172525
 Ignore-this: fbaea445a392023ed8ed04c785a58f37
] =

[Resolve issue1884: correct report about getting lazy repository
Alexey Levan <exlevan@gmail.com>**20100903175429
 Ignore-this: b533c7d2c508ae33ef37a01faa7e0863
] =

[Redefine Darcs.Commands.putInfo in Darcs.Repository
Alexey Levan <exlevan@gmail.com>**20100819195331
 Ignore-this: 26b1130296f8eef6840837b2abf03912
] =

[Remove now-superfluous cleanup step from EXAMPLE.sh
Eric Kow <kowey@darcs.net>**20100903084324
 Ignore-this: 65462aa06547454ef9dbf11f808a0f5
 Hooray for the new harness!
] =

[Use lib in tests/issue257.sh.
Petr Rockai <me@mornfall.net>**20100902142129
 Ignore-this: 1ba89ebcf1ef1d047129f9ca89ebdb58
] =

[Remove the now-defunct Distribution directory.
Petr Rockai <me@mornfall.net>**20100829191717
 Ignore-this: a4af7e0874f6b189dc245b1c778dbba6
] =

[Add a tarball of a small oldfashioned repository for testing purposes.
Petr Rockai <me@mornfall.net>**20100829174448
 Ignore-this: c096717668219f6e821707c5aa8c3ac4
] =

[Update haddock.
Petr Rockai <me@mornfall.net>**20100717084048
 Ignore-this: 47776265ebb4ba397727be5e8abe982b
] =

[Use more meaningful names for seal_up_patches' parameters.
Petr Rockai <me@mornfall.net>**20100715085938
 Ignore-this: e467f879f05f8a0d62fac26d19babc3b
] =

[Wibble path building in Repository.Prefs.
Petr Rockai <me@mornfall.net>**20100714175208
 Ignore-this: 6664f81e589a919baa9e293e455cea51
] =

[Document cultural reference in Darcs.Witnesses.WZipper.
Eric Kow <kowey@darcs.net>**20100902192731
 Ignore-this: f88c4b9d1fc6e00f513ded7b5769995f
] =

[Jot down a few more tips about testing.
Eric Kow <kowey@darcs.net>**20100826171452
 Ignore-this: 93560f7f12d291899f1b3b0cc6740909
] =

[Add MIT boilerplate to all public domain scripts.
Eric Kow <kowey@darcs.net>**20100809125302
 Ignore-this: 92cd27ff71d7af5f4318133de3340acd
 The goal is to limit Darcs authors' liability.
] =

[Update issue1503 network test for new harness.
Eric Kow <kowey@darcs.net>**20100902162701
 Ignore-this: acde8373c08373f589a39653bc622427
 Apparently, the new harness treats network test the same as regular
 tests (by copying them straight to a standalone directory)
] =

[Propagate the exit code of darcs-test to exit code of cabal test.
Petr Rockai <me@mornfall.net>**20100902140203
 Ignore-this: cebf3b959529c4728988d3879aacb839
] =

[Allow "output=3Dplain" to be passed to cabal test.
Petr Rockai <me@mornfall.net>**20100902135800
 Ignore-this: 9394ecd4cb3e1aed3ec591906786495b
] =

[Suppress check for darcs-test in Setup.
Eric Kow <kowey@darcs.net>**20100902124521
 Ignore-this: 6fe4a0badaa12ef5352286850e4f30a6
 It is now always built.
] =

[More portable executable names in Setup.
Eric Kow <kowey@darcs.net>**20100902124519
 Ignore-this: 77abdc7a3549030566d438c162faa51e
] =

[Update cabal file for new test-support paths.
Eric Kow <kowey@darcs.net>**20100902123719
 Ignore-this: 94f4cf40b62dc857e55492a4c8afa16f
] =

[Fix conflicts between darcs-test enabling and other cabal patches.
Eric Kow <kowey@darcs.net>**20100902095835
 Ignore-this: 732c023fa9a6cb6b02fbd27741c7daa9
 =

 To my awareness:
 - raising base package dependency
 - dropping PatternSignatures
] =

[Drop the "test" cabal flag and build darcs-test unconditionally.
Petr Rockai <me@mornfall.net>**20100829135623
 Ignore-this: 9363f6325c308c32a5410f81362a5f01
] =

[Fix a bug in cabal test argument parsing.
Petr Rockai <me@mornfall.net>**20100829171538
 Ignore-this: 1eb65db930dd9248ab4b144d9f37fc29
] =

[Make it possible to pass "threads=3DN" to cabal test.
Petr Rockai <me@mornfall.net>**20100829164545
 Ignore-this: 48cae1e80315778ba2e84f05ff3bd80c
] =

[Replace some developer links with a wiki page.
Eric Kow <kowey@darcs.net>**20100902135224
 Ignore-this: a193af1b73b557b44c3af330327e9104
] =

[Nicer patch counting mechanism for buildbot-try.
Eric Kow <kowey@darcs.net>**20100902103104
 Ignore-this: f57bfc394ce4d053f0fc11bf1014536d
] =

[Use unified diff for copying unrecorded changes in buildbot-try.
Eric Kow <kowey@darcs.net>**20100902101247
 Ignore-this: 29f9707e442ca9c29579bf4cd8596689
 This avoids a "patch: **** Only garbage was found in the patch input."
] =

[Wrap buildbot-try with ssh-agent.
Eric Kow <kowey@darcs.net>**20100902100403
 Ignore-this: 72f399a232c853227fc7015d1963495f
] =

[URL.hs: fix a typo in import list
Jason Dagit <dagit@codersbase.com>**20100902064509
 Ignore-this: 3d1a269a53195e5d372290ff00c2b946
] =

[Fix for issue1932
Dmitry Astapov <dastapov@gmail.com>**20100825173045
 Ignore-this: 68db2c42ef376307271a7f609e62481c
 Do _not_ check for colons in "isRelative" - everything is covered
 inside Add.lhs and governed by use of "--reserved-ok" option.
 =

 Replace isRelative and isAbsolute with functions from System.FilePath
 for correct handling of platform specifics.
] =

[Bump shellish dependency to >=3D 0.1.1, to avoid the infinite loop in rm_r=
f problem.
Petr Rockai <me@mornfall.net>**20100829134747
 Ignore-this: 4bbf50f15d3cabea8f38893bc6844340
] =

[Flip "cabal test" over to use darcs-test to run the shell tests.
Petr Rockai <me@mornfall.net>**20100827220454
 Ignore-this: dc18d078ee7e34eaddcd82bf2599349d
] =

[Add a --network option to darcs-test to run the network shell tests.
Petr Rockai <me@mornfall.net>**20100827220414
 Ignore-this: 3aaa854e05cb5274410666212aa714ab
] =

[Couple of improvements in the new shell test runner.
Petr Rockai <me@mornfall.net>**20100827220353
 Ignore-this: e4b0e3f6b8470c5d53cc4eeecf562920
] =

[Implement a test-framework-based shell harness.
Petr Rockai <me@mornfall.net>**20100827204448
 Ignore-this: 819e700538a38bf35e04eb7656b3c151
 =

 This merges the two test drivers we previously had, "unit" and
 Distribution.ShellHarness (used directly by Setup), into a single "darcs-t=
est"
 binary. This patch only goes half the way, though: the new shell harness i=
s not
 used by "cabal test" yet. That will come as a separate patch.
] =

[send prints remote address right away
Guillaume Hoffmann <guillaumh@gmail.com>**20100822154314
 Ignore-this: bd428e547137caa1a2b9862981e63085
] =

[Use long titles for more stable URLs in user manual.
Eric Kow <kowey@darcs.net>**20100812104830
 Ignore-this: 98a8e736b4d2b784118075962c9af6e0
] =

[Changes.lhs: remove extra (and weird) case
Jason Dagit <dagit@codersbase.com>**20100822122659
 Ignore-this: 3c12488f0a953e7d79edfafbd1c74ffc
] =

[TheComands.hs: fix prelude import
Jason Dagit <dagit@codersbase.com>**20100828170634
 Ignore-this: 8b2edfaea4ba634f63a227ee9ce1a13e
] =

[Fix conflict between base and hashed-storage deps. =

Eric Kow <kowey@darcs.net>**20100828194949
 Ignore-this: 7974cd005f4200156c8fad220599eba4
] =

[Remove PatternSignatures as we currently require GHC 6.10 and up.
Eric Kow <kowey@darcs.net>**20100723131843
 Ignore-this: 567dcb5da237e9876e6f590f062da42e
] =

[Raise base package dependency to >=3D 4 (keeping it < 5).
Eric Kow <kowey@darcs.net>**20100825152135
 Ignore-this: 944cdfa0ea7f940a4a52f24dd9bf6c5b
 We now require GHC 6.10.x or higher.
] =

[add missing V2.hs
Ganesh Sittampalam <ganesh@earth.li>**20100827061307
 Ignore-this: 400c1d5662fc995498fea48512c5c055
] =

[move some Patchy instances into a separate file
Ganesh Sittampalam <ganesh@earth.li>**20100826232436
 Ignore-this: bd7663370d6b2ab5cd0ecd89ce573b8b
] =

[don't export Patch/RealPatch from Darcs.Patch
Ganesh Sittampalam <ganesh@earth.li>**20100826155238
 Ignore-this: b419b6e01801631fb617fa2bbcf7e0e3
 This gets us closer to separating specific implementations from
 the interface.
 =

] =

[split up the Commute class
Ganesh Sittampalam <ganesh@earth.li>**20100826135850
 Ignore-this: f0e77899afed11193776aa998547824e
 Note that Prim is not an instance of the new Merge class,
 which reflects reality as Prims cannot always be merged.
 =

] =

[get rid of unnecessary superclass
Ganesh Sittampalam <ganesh@earth.li>**20100826133602
 Ignore-this: 8d4ed17afe597610594376019ed4d282
] =

[drop some exports from Darcs.Patch
Ganesh Sittampalam <ganesh@earth.li>**20100826132758
 Ignore-this: be40ab5ed92a8e7f6be40928e73ad414
 Made imports go directly to the internal modules where necessary,
 on the grounds that it's better to be explicit when making use of
 internal operations.
 =

] =

[break Patch-specific bits of Show and Viewing out into V1
Ganesh Sittampalam <ganesh@earth.li>**20100826125537
 Ignore-this: 52f166938cef87f20d537cb0fa8b4cb7
] =

[get rid of apparently unnecessary instance dependency
Ganesh Sittampalam <ganesh@earth.li>**20100826123346
 Ignore-this: 20618e90cae5721e1d6c58f505bc51c2
 showContextPatch for Prim was sometimes constructing a Patch
 (with the PP constructor) for no apparent reason, as the end result
 would be to show the underlying Prim again.
 =

] =

[move v1 Patch applying into separate module
Ganesh Sittampalam <ganesh@earth.li>**20100826122140
 Ignore-this: 354af0908b377a81e06fe2312ab97ce0
] =

[move v1 Patch reading into separate module
Ganesh Sittampalam <ganesh@earth.li>**20100826122137
 Ignore-this: 7c99ff9c15a9041b9bfc1d1f3b0c3214
] =

[Darcs.Patch.Core now just contains Named
Ganesh Sittampalam <ganesh@earth.li>**20100826110141
 Ignore-this: 5768341309317a826a0edbdf07ae6379
] =

[move Named instances out of V1.Commute
Ganesh Sittampalam <ganesh@earth.li>**20100826110140
 Ignore-this: 4cd087b3e44d5faea1336c002661bdcf
] =

[move Darcs.Patch.Commute into V1 namespace
Ganesh Sittampalam <ganesh@earth.li>**20100826110134
 Ignore-this: 749ac611fd08c6f592b590e0354ad8dd
] =

[move RealPatch into its own namespace
Ganesh Sittampalam <ganesh@earth.li>**20100826104437
 Ignore-this: 36156baeca5f13590dceb3446678b55f
] =

[remove unused re-export
Ganesh Sittampalam <ganesh@earth.li>**20100826104437
 Ignore-this: 5e054202fb305236510fef9e2952024d
] =

[start on moving v1 patch code into its own namespace
Ganesh Sittampalam <ganesh@earth.li>**20100826104427
 Ignore-this: eec8240329032f6f255d10eb041a8e9e
] =

[fix warnings in Darcs.SelectChanges
Ganesh Sittampalam <ganesh@earth.li>**20100826095122
 Ignore-this: 1c777fb9d928dae858a24efddfef98fd
] =

[fix warnings in Darcs.Commands.Apply
Ganesh Sittampalam <ganesh@earth.li>**20100826095113
 Ignore-this: 1b76a37c73761798baa56bfde9c9d708
] =

[fix warnings in Darcs.Witnesses.Ordered
Ganesh Sittampalam <ganesh@earth.li>**20100826094553
 Ignore-this: 1c5efae9c25b51df7fd1331ea59f2ebe
] =

[fix warning in Darcs.Repository.Repair
Ganesh Sittampalam <ganesh@earth.li>**20100826094545
 Ignore-this: b85f58cb0d4fa4240779aa5c59914f0d
] =

[fix warning in Darcs.Patch.Depends
Ganesh Sittampalam <ganesh@earth.li>**20100826094536
 Ignore-this: 76788f91e654c3beb5ea1e17cf11ff45
] =

[fix warning in Darcs.Patch.Choices
Ganesh Sittampalam <ganesh@earth.li>**20100826094519
 Ignore-this: 6649d874067019ca62f759e01740f1c6
] =

[fix warnings in Darcs.Commands.Send
Ganesh Sittampalam <ganesh@earth.li>**20100826094436
 Ignore-this: aab88b0280ddb1c81f6457741abd86d6
] =

[fix warnings in Darcs.Commands.Record
Ganesh Sittampalam <ganesh@earth.li>**20100826094428
 Ignore-this: 75cc3c3c905309ca60d6282f969ed15f
] =

[fix warnings in Darcs.Commands.Push
Ganesh Sittampalam <ganesh@earth.li>**20100826094247
 Ignore-this: f925114d28f55010b179fd5109767bf4
] =

[fix warnings in Darcs.Commands.Pull
Ganesh Sittampalam <ganesh@earth.li>**20100826094224
 Ignore-this: c139ae114740ec0503bdeffa18d568ef
] =

[fix warnings in tests
Ganesh Sittampalam <ganesh@earth.li>**20100826092245
 Ignore-this: ed89d27a3d77fe9a60b87a8087e81351
] =

[Depends.hs: add back catch all case to silence warning
Jason Dagit <dagit@codersbase.com>**20100825080244
 Ignore-this: 627e1db4ae434f24ada1e158819eb2ff
] =

[Fix issue1926 headers.
Eric Kow <kowey@darcs.net>**20100826162703
 Ignore-this: 8badc1a7cda103f90084b55efcf65e4b
] =

[Accept issue1926: amend-record ignores --index option.
Iago Abal <iago.abal@gmail.com>**20100820001354
 Ignore-this: 90956b2aeb8f3ddedbc6a293e0d942dc
] =

[Avoid cascading permissions error in issue612 test.
Eric Kow <kowey@darcs.net>**20100826161551
 Ignore-this: b056c9686e8d0b8345c8f7ce65280a7a
 The test fails, leaving behind an unwritable directory.
] =

[fix unit test imports
Jason Dagit <dagit@codersbase.com>**20100825100722
 Ignore-this: 129c545cc4dd973ff4cf754f4b69d5f0
] =

[clean up Witnesses imports across codebase
Jason Dagit <dagit@codersbase.com>**20100825095657
 Ignore-this: d9696059af803c483f204291eea89d14
] =

[ArgumentDefaults.lhs: fix warnings
Jason Dagit <dagit@codersbase.com>**20100825084359
 Ignore-this: a23fd53ef800c1f2cae3917545b256d1
] =

[Commands/Put.lhs: fix warnings
Jason Dagit <dagit@codersbase.com>**20100825084340
 Ignore-this: e13fc3447482e7b87e416f40b98eac12
] =

[Commands/Pull.lhs: fix warnings
Jason Dagit <dagit@codersbase.com>**20100825083920
 Ignore-this: 5f6e6dc88fb6cd9093e6f8ad1d8329d5
] =

[Commands/Unrevert.lhs: remove redundant imports
Jason Dagit <dagit@codersbase.com>**20100825083536
 Ignore-this: 2bb11aeaee05c82eec5b55e516f76283
] =

[Commands/Unrecord.lhs: fix warnings
Jason Dagit <dagit@codersbase.com>**20100825083412
 Ignore-this: 25fd54bd955aca1a18cb39c152e7ea38
] =

[Commands/Send.lhs: remove redundant imports
Jason Dagit <dagit@codersbase.com>**20100825083244
 Ignore-this: 1faa62977b78e48f47029a4867c6a38e
] =

[Commands/Record.lhs: remove redundant imports
Jason Dagit <dagit@codersbase.com>**20100825083111
 Ignore-this: bc229dd308ef6f77826ebc31811e65cf
] =

[Commands/Apply.lhs: fix warnings
Jason Dagit <dagit@codersbase.com>**20100825082948
 Ignore-this: 358cb1b5c897e97fbf46285efd9e73c7
] =

[SelectChanges.hs: fix warnings
Jason Dagit <dagit@codersbase.com>**20100825082701
 Ignore-this: 29e6306b93f85ec52d29f46cf0f54d28
] =

[Annotate.lhs: remove redundant imports
Jason Dagit <dagit@codersbase.com>**20100825081814
 Ignore-this: 71c18cdd5c8fffb489245082fb797132
] =

[Population.hs: remove redundant imports
Jason Dagit <dagit@codersbase.com>**20100825081621
 Ignore-this: 444a9343bcdf7b52bd5cf4312562424f
] =

[ShowFiles.lhs: rename shadowed binding
Jason Dagit <dagit@codersbase.com>**20100825081508
 Ignore-this: 1466870bbca19cee11d38a0c9ed2de01
] =

[Get.lhs: remove redundant import
Jason Dagit <dagit@codersbase.com>**20100825081324
 Ignore-this: f5366f35d77658679b49438aaf3d72b3
] =

[Commands/Diff.lhs: remove redundant import
Jason Dagit <dagit@codersbase.com>**20100825081227
 Ignore-this: b6f2943dc58bf9a17381cf837c806f9f
] =

[Match.lhs: remove redundant imports
Jason Dagit <dagit@codersbase.com>**20100825081058
 Ignore-this: fa009342dac6474b59c8fe65782bb497
] =

[WhatsNew.lhs: fix warnings
Jason Dagit <dagit@codersbase.com>**20100825080822
 Ignore-this: 6f4178fe4d32155fd8d47a01d9d39e45
] =

[HashedRepo.hs: clean up imports to fix warnings
Jason Dagit <dagit@codersbase.com>**20100825080704
 Ignore-this: cf815b7eb616ba8a72046474b5d6bd24
] =

[splitout parts of Darcs.Witnesses into new modules
Jason Dagit <dagit@codersbase.com>**20100825080336
 Ignore-this: 695abc0f04daf229280cbcf5a0414381
 This allows us to remove an Orphan Instances warning.  I also look the
 liberty of regrouping the Witnesses modules in the .cabal file while I
 was adding new ones.
] =

[TrackDown.lhs: fix warnings
Jason Dagit <dagit@codersbase.com>**20100825075132
 Ignore-this: d41b7265690aeaf8e51f023ce783af3a
] =

[ShowAuthors.lhs: remove redundant import
Jason Dagit <dagit@codersbase.com>**20100825074948
 Ignore-this: 57381441eb6213ff318cf77218826bde
] =

[MarkConflicts.hs: rename shadowed binding
Jason Dagit <dagit@codersbase.com>**20100825074944
 Ignore-this: 60d749353045dca6e5d1c2ae3ba205bb
] =

[Convert.lhs: remove redundant import
Jason Dagit <dagit@codersbase.com>**20100825074614
 Ignore-this: 519e804e378f0ee12d722ea6957bc29
] =

[Repository.hs: remove unused binding
Jason Dagit <dagit@codersbase.com>**20100825074459
 Ignore-this: 29643af7b95406931015c6cbd375974e
] =

[Merge.hs: remove redundant import
Jason Dagit <dagit@codersbase.com>**20100825074347
 Ignore-this: b999405e2e36d804119ad469af862f59
] =

[Checkpoint.hs: remove redundant imports
Jason Dagit <dagit@codersbase.com>**20100825074202
 Ignore-this: ecadbbb93d9dee99284b61abe6a35a2b
] =

[Internal.hs: remove warnings
Jason Dagit <dagit@codersbase.com>**20100825073952
 Ignore-this: dbb1a38fd632fb0614bb5e34eb50a67a
] =

[Info.hs: remove redundant imports
Jason Dagit <dagit@codersbase.com>**20100825073038
 Ignore-this: 8469f5e4a347ce13312be3a06b198407
] =

[URL.hs: fix warning about conditional import of debugFail
Jason Dagit <dagit@codersbase.com>**20100825071513
 Ignore-this: 5a99ec5562f21149bb7fdc0787ba8bc3
] =

[Diff.hs: remove unused bindings
Jason Dagit <dagit@codersbase.com>**20100822205621
 Ignore-this: 4bcdec6c2d73e4ea2f0c12924b24eda2
] =

[ReadMonads.hs: remove unused lexStrings
Jason Dagit <dagit@codersbase.com>**20100822205419
 Ignore-this: fb814316841148aec8c194e43c1b7e29
] =

[Global.hs: remove import to fix warning
Jason Dagit <dagit@codersbase.com>**20100822202309
 Ignore-this: 5ee771f8f5b18c6959748ced7104b782
] =

[move dropWhileFL to Ordered.hs
Jason Dagit <dagit@codersbase.com>**20100822201758
 Ignore-this: 16e4e0bf9db14111e1720fc339c36118
] =

[move dropWhileRL to Ordered.hs
Jason Dagit <dagit@codersbase.com>**20100822201325
 Ignore-this: b35648bb19b81a3da95c0df9ebf5479f
] =

[Accept issue1931: Fix issue612 test and mark it as failing.
Eric Kow <kowey@darcs.net>**20100825181318
 Ignore-this: f62177c4ea5ba8ff637c4289a5e470fc
 Jason Dagit points out in issue1931 that this interacts badly with
 issue1898, and that fixing this bad interaction reveals a regression.
] =

[Modernise issue612 test (use exit 200 to skip).
Eric Kow <kowey@darcs.net>**20100825180438
 Ignore-this: e9865dc321ee2e4a77828890cf17a7bf
] =

[ReadMonads.hs: rename State to ParserState
Jason Dagit <dagit@codersbase.com>**20100822192811
 Ignore-this: c07450667ec5ee151d0da692f93cbbdd
] =

[dramatically improve the parser performance
Jason Dagit <dagit@codersbase.com>**20100813055454
 Ignore-this: 4f8912e2e8bf2504e4a6db064647f747
 This puts the parser's performance back to where it was before the
 move to a Parsec-like API.  The cruxt of the fix was to implement
 linesStartingWith as a primitive instead of implementing it using
 other parser primitives.  Several other tricks are included, such as
 using strict tuples that are partially specialized.
] =

[ReadMonad.hs: fix haddocks
Jason Dagit <dagit@codersbase.com>**20100811061208
 Ignore-this: cd645b569c09bc928d5c048281be3599
] =

[handle whitespace lexing more intelligently in Read.hs
Jason Dagit <dagit@codersbase.com>**20100811061027
 Ignore-this: 50aa395330b18eebb7ff19fffb20ff1f
] =

[tidy up Info.hs
Jason Dagit <dagit@codersbase.com>**20100809032821
 Ignore-this: ac5e02c985e4002c3ebc0127e6323aa0
 The comment about break no longer applies as break is no longer used.
 Using choice instead of (<|>) keeps linesStartingWithEndingWith a
 little prettier.
] =

[tidy up Real.hs and refactor space lexing
Jason Dagit <dagit@codersbase.com>**20100809024422
 Ignore-this: 1a9d28746e66829a93ca0bcf56a30bd
] =

[tidy up peekforc
Jason Dagit <dagit@codersbase.com>**20100809022145
 Ignore-this: 5ceeaa263cc9dbefcef3c024c543aa6a
] =

[remove unused import
Jason Dagit <dagit@codersbase.com>**20100809022115
 Ignore-this: b2da893f3898f025d8202e4ad0152f1d
] =

[tidy up readPatches
Jason Dagit <dagit@codersbase.com>**20100809021522
 Ignore-this: 5929ef7369d10eaeba00ed31bf1b3a71
] =

[remove unneeded export
Jason Dagit <dagit@codersbase.com>**20100809020547
 Ignore-this: f71c6afa72b83c045420fae722260a43
] =

[optimize char parser
Jason Dagit <dagit@codersbase.com>**20100809020539
 Ignore-this: 63d6f4d23bfd7be0909e56b7ebcde1f6
] =

[tidy up linesStartingWith
Jason Dagit <dagit@codersbase.com>**20100809020457
 Ignore-this: 545ff01a026e1c95dd9374e487eb99c5
] =

[tidy up skipNewline
Jason Dagit <dagit@codersbase.com>**20100809020446
 Ignore-this: e2f01a232b79206c3df0bc7677a05ce
] =

[tidy up anyChar parser
Jason Dagit <dagit@codersbase.com>**20100809001850
 Ignore-this: 98b7cfbe94e99a7642ed730b32fa924b
] =

[remove unused word8 parser
Jason Dagit <dagit@codersbase.com>**20100809001809
 Ignore-this: 91cf66b621630592915a59d45a821054
] =

[tidy up readPatchInfo
Jason Dagit <dagit@codersbase.com>**20100808233424
 Ignore-this: d9f216388b1ab16db67630281ff8893a
] =

[improve interface of peekforw and bracketedFL
Jason Dagit <dagit@codersbase.com>**20100808201140
 Ignore-this: a40baa17b36e603c386fb2f3ec445e2e
] =

[accept issue1928: removing a file then adding a directory with the same na=
me breaks
Ganesh Sittampalam <ganesh@earth.li>**20100820212601
 Ignore-this: 1c78189df95320abe701a5b1bba6a227
] =

[Restore obliterate output options.
Eric Kow <kowey@darcs.net>**20100815211308
 Ignore-this: 7a561054370ff4ee87f89556e391e8dd
 =

 They were removed for Darcs 2.5, but we can keep them in unstable
 and resolve the underlying bug instead.
 =

 rolling back:
 =

 Sun Aug 15 20:20:10 BST 2010  Reinier Lamers <tux_rocker@reinier.de>
   * resolve issue1924: remove output options of obliterate
 =

      ./tests/issue1909-unrecord-O-misses-tag.sh -> ./tests/failing-issue19=
09-unrecord-O-misses-tag.sh
     M ./src/Darcs/Commands/Unrecord.lhs -3 +1
] =

[Resolve conflict between 'Also set binary mode' duplicates.
Eric Kow <kowey@darcs.net>**20100815205035
 Ignore-this: dd6c205afb649768a7be93e23e7defb
] =

[Reframe Darcs.Match.matchFirstPatchset documentation.
Eric Kow <kowey@darcs.net>**20100813172244
 Ignore-this: b78a42d6dcc56a12eedebc31c6e82641
 This says the same thing but hopefully makes it easier to grasp.
] =

[Improve module-level documentation for Darcs.Match.
Eric Kow <kowey@darcs.net>**20100813171053
 Ignore-this: c58ea6edfd1e1a6f1e18d13c5dd70ff
] =

[Move Darcs.Match module-specific haddock to module level.
Eric Kow <kowey@darcs.net>**20100813164759
 Ignore-this: fad00c742590d0775a57bc3ec4878efe
 Also correct last_match to secondMatch.
] =

[Tweak complaint about DARCS_CONNECTION_TIMEOUT.
Eric Kow <kowey@darcs.net>**20100812114200
 Ignore-this: a8b968847283d5e726f95285db8a418b
] =

[Add environment variable DARCS_CONNECTION_TIMEOUT
builes.adolfo@googlemail.com**20100811212121
 Ignore-this: a9d945925956f1c9d3c27d9e02b66de6
] =

[Tighten up section on per-repository caches a bit.
Eric Kow <kowey@darcs.net>**20100812112056
 Ignore-this: c16eb0d0a85a18f75dfae4be5b2780c
 Particularly, we want to avoid mixing in the notion of conflicts,
 which could confuse users.
] =

[Adding information about cache handling to manual
builes.adolfo@googlemail.com**20100811200211
 Ignore-this: 3a794fa6509c0b454f89b8552b2a19cd
] =

[Tweak title case for repository formats chapter for consistency.
Eric Kow <kowey@darcs.net>**20100812103910
 Ignore-this: 895e769be91810a2cfd9c475541d4f08
] =

[Add DARCS_CONNECTION_TIMEOUT info to user manual
builes.adolfo@googlemail.com**20100811190100
 Ignore-this: cd46eca91eccf1c9d3a5643c39cec5df
] =

[Correct error code for curl operation timeout
builes.adolfo@googlemail.com**20100810215522
 Ignore-this: 26067bd441b2b7fabaadce67851f0ef9
] =

[Adding some haddock to Cache.hs
builes.adolfo@googlemail.com**20100810215116
 Ignore-this: 34560d0bfcf1da1690742421b835caf
] =

[remove redundant imports in Patchy and Real
Jason Dagit <dagit@codersbase.com>**20100807160837
 Ignore-this: 2babfb43cb1f340876ae9ce914c1a454
] =

[fix conflict in Bundle
Jason Dagit <dagit@codersbase.com>**20100807160542
 Ignore-this: 1bdbe27903b8f464838ab97b9c3df12f
] =

[remove try combinator from ReadMonads
Jason Dagit <dagit@codersbase.com>**20100807160342
 Ignore-this: 80bb069e6744788d69d8cec5eb1a438a
] =

[micro optimizations to parser code
Jason Dagit <dagit@codersbase.com>**20100807160148
 Ignore-this: 876d06693dca962b60f9a81740978765
 These micro-optimizations should always be safe; prefering ByteString
 over String and reducing packing/unpacking.
] =

[remove all uses of try from parser code
Jason Dagit <dagit@codersbase.com>**20100807153421
 Ignore-this: 904f9415cf9b0a7f773a6b9b7b099007
] =

[ReadMonads no longer exports maybeWork fix other modules to match
Jason Dagit <dagit@codersbase.com>**20100725175120
 Ignore-this: 437b41f08ca584d3ce0fc45cae7f207d
] =

[refactor Read to not rely on 'work'
Jason Dagit <dagit@codersbase.com>**20100725163359
 Ignore-this: c2ed2d0babfff2a22c3cb3918dcac78a
] =

[ReadMonads no longer exports myLex, clean up imports in Real
Jason Dagit <dagit@codersbase.com>**20100725144618
 Ignore-this: 7e305152e13b0a6b175c04e49ea1bd5
] =

[refactor Read to use myLex'
Jason Dagit <dagit@codersbase.com>**20100725144403
 Ignore-this: aa7f97c4f2661d96615294add1ced7f8
] =

[ReadMonads no longer exports alterInput and clean up a few warnings
Jason Dagit <dagit@codersbase.com>**20100725142911
 Ignore-this: 429ca05040f2ff94f7cbbde595f2b5de
] =

[cleanup import list of Patchy
Jason Dagit <dagit@codersbase.com>**20100725141855
 Ignore-this: 7b096029f7c4521e924a619d09752515
] =

[remove peekInput from Real.  peekInput no longer exported from ReadMonads
Jason Dagit <dagit@codersbase.com>**20100725141605
 Ignore-this: c49bf70941372ba9241f13f088371f5c
] =

[refactor Patchy to not use peekInput
Jason Dagit <dagit@codersbase.com>**20100725135658
 Ignore-this: 853181469c09b52a5b8628a2f0dc8546
] =

[refactor Read and ReadMonads to remove peekInput from Read
Jason Dagit <dagit@codersbase.com>**20100725133132
 Ignore-this: 787c8b8f3b5584472cfa4f83db671fde
] =

[add utility functions to ReadMonads
Jason Dagit <dagit@codersbase.com>**20100725120651
 Ignore-this: 16edfdb6bb5c8c24600865854263e897
 The intention of these functions is that in the future we will be able
 to use more conventional notation to express parsers in the darcs source.
] =

[tune the patch parser
Jason Dagit <dagit@codersbase.com>**20100725085610
 Ignore-this: 869bb399d759f19b1a2fdbb466743d17
 This patch is based on a few observations:
   * alterInput (const foo), completly replaces the parser's input
   * after peekInput, the above trick avoids redundant processing
   * best to leave a packed ByteString packed
] =

[Resolve issue1908: try to create a global cache before checking its availa=
bility.
Petr Rockai <me@mornfall.net>**20100808122419
 Ignore-this: a93e6f5d4a1272fc49341236820a9833
] =

[Add a "buildbot-try" script to contrib that submits local changes to build=
bot.
Petr Rockai <me@mornfall.net>**20100808133328
 Ignore-this: 96e90b4581df1f297f423611d64c7
] =

[Skip testing of issue1599 on old-fashioned repos.
Petr Rockai <me@mornfall.net>**20100808123648
 Ignore-this: 2bfa977b37c63dc22c8024994197d0af
] =

[Test for issue1599: expire unused caches
builes.adolfo@googlemail.com**20100807211143
 Ignore-this: 8b77c20113c6b1d18019810ff7e11c3d
] =

[Fail more verbosely in issue1879-same-patchinfo-uncommon.sh.
Petr Rockai <me@mornfall.net>**20100808105641
 Ignore-this: 88665b641ab15527c37c39b1bd78a772
] =

[Also set binary mode on stderr (we already had stdin/stdout).
Petr Rockai <me@mornfall.net>**20100808095353
 Ignore-this: a3c37a0fb16fd27da1f47ee101d07295
] =

[Resolve issue1530: allow user to pick from multiple email address.
Eric Kow <kowey@darcs.net>**20100718113353
 Ignore-this: 531e6c9498f9155c1a8f926ee56a68e3
 If your global authors pref has more than one line in it, Darcs will
 prompt you something like:
 =

   You have saved the following email addresses to your global settings:
   1. Fred Bloggs <fred@example.net>
   2. Fred Bloggs <fred@home.example.tld>
   3. BLOGGS Fred <fbloggs@example.com>
   4. Other
   Please select an email address for this repository. =

] =

[Helper Darcs.Utils.askUserListItem to select from an arbitrary list.
Eric Kow <kowey@darcs.net>**20100718112610
 Ignore-this: 1583cecc95940234ea5703b01094afcb
] =

[Add a simple test for http get with packs.
Petr Rockai <me@mornfall.net>**20100804190930
 Ignore-this: cab6334359dbf54c3087e0619d8af4b4
] =

[Add a simple non-network test for darcs get over http.
Petr Rockai <me@mornfall.net>**20100804190927
 Ignore-this: c3545fe52f79ce9ae720499e381f3823
] =

[Resolve issue 1599: automatically expire unused caches
builes.adolfo@googlemail.com**20100807003339
 Ignore-this: c12f0cd04794e2db03445b71815b9e3a
] =

[resolve issue1896: enable witnesses for library
Ganesh Sittampalam <ganesh@earth.li>**20100721053731
 Ignore-this: 5209e15b5d2c446eea5df2fe1fe700b5
] =

[Undo an edit to the issue1829 test, since the original was clearer.
Petr Rockai <me@mornfall.net>**20100806131253
 Ignore-this: 925c73124e2b3d17239ccb7c47578f19
] =

[Add a test for issue1829 by Ganesh & Ian.
Petr Rockai <me@mornfall.net>**20100806125230
 Ignore-this: 7e11a7b4b54f189e1864952ff048f0fb
] =

[Cut functions Darcs.Utils.putStrLnError and putDocLnError.
Eric Kow <kowey@darcs.net>**20100718102621
 Ignore-this: 92c29385add92fb7b875342842432b5a
] =

[Tidy Darcs.Utils exports.
Eric Kow <kowey@darcs.net>**20100718101900
 Ignore-this: 78740886b92947d941f0e3baa86ba3f2
] =

[switch homepage to two-column format ala xmonad.org
Guillaume Hoffmann <guillaumh@gmail.com>**20100805134439
 Ignore-this: 21fa11e338fd9064b526f96c2f5be12
] =

[Remove a couple of redundant type variables from foralls.
Petr Rockai <me@mornfall.net>**20100806085630
 Ignore-this: 552924bfd0cf15cd9c5922a88ae282f9
] =

[Fix missing type signature in Darcs.Arguments.
Eric Kow <kowey@darcs.net>**20100726134237
 Ignore-this: 8f69ae4defc489d4a4ec9c5734fa2376
] =

[Fix warnings in Darcs.Repository.State.
Eric Kow <kowey@darcs.net>**20100723134611
 Ignore-this: 5a7c4a33c95ba3285721d0ade56adf1b
] =

[Fix warnings in Darcs.Repository.InternalTypes.
Eric Kow <kowey@darcs.net>**20100723134556
 Ignore-this: 66a361e0ff4b1a0c616fb11dafc6467c
] =

[Fix warnings in Darcs.Repository.HashedIO.
Eric Kow <kowey@darcs.net>**20100723134533
 Ignore-this: af2a60a5bf64d53240dc4498696c7a42
] =

[Fix warnings in Darcs.Repository.DarcsRepo.
Eric Kow <kowey@darcs.net>**20100723134515
 Ignore-this: 66f45d925ab9a7bce4c6e69ded8803fe
] =

[Fix warnings in Darcs.Patch.Prim.
Eric Kow <kowey@darcs.net>**20100723134501
 Ignore-this: dfd3b36b4b07e6de3b558073ac6bbe27
] =

[Fix redundant import warning in Darcs.Patch.Patchy.
Eric Kow <kowey@darcs.net>**20100723134447
 Ignore-this: 3fa7ffaf1b8098c4c0793c3ccc5ecb36
] =

[Fix redundant imports in Darcs.Patch.Commute.
Eric Kow <kowey@darcs.net>**20100723133540
 Ignore-this: 1c6919da737a8fd265a5dde9e94bbf35
] =

[Fix shadow warning in Darcs.Patch.Choices.
Eric Kow <kowey@darcs.net>**20100723133357
 Ignore-this: 88183e55fcac7c9fa2372f35decf643f
] =

[Fix redundant imports in Darcs.Patch.Apply.
Eric Kow <kowey@darcs.net>**20100723133239
 Ignore-this: dbf30f383e7a0684ca2b9cf9dcd50fb7
 Likely due to setScriptsExecutable refactor.
] =

[Fix RemoteDarcs related imports warning in Darcs.Flags and Darcs.RemoteApp=
ly.
Eric Kow <kowey@darcs.net>**20100723132408
 Ignore-this: f944bbc547fa4f8e1a70c8c3539ce6bc
] =

[Fix deprecation warning on GHC.Handle in Exec module.
Eric Kow <kowey@darcs.net>**20100723131847
 Ignore-this: 12a57c2a78af7d2c6428ec544cd09f98
 It looks like it was deprecated in GHC 6.12 along with the
 Unicode-oriented rewrite.
] =

[Re-enable packs and optimize --http.
Petr Rockai <me@mornfall.net>**20100804185357
 Ignore-this: f86b0ea0c1008dbd173c7b8145be6803
] =

[Minimize the number of packed inventories
Alexey Levan <exlevan@gmail.com>**20100802035445
 Ignore-this: 1f3d28bece5b29d599ea97be9bba5424
] =

[Use cache while getting a packed repository
Alexey Levan <exlevan@gmail.com>**20100802024914
 Ignore-this: 33e44bdfce82d89fd243e7d628ce2c34
] =

[Hardlink files while getting a packed repository
Alexey Levan <exlevan@gmail.com>**20100801050349
 Ignore-this: 8e6aa73b3a0cc84812d44beaaea701dd
] =

[Add pronoun to english module
builes.adolfo@googlemail.com**20100803131432
 Ignore-this: 707096c1b8c9d0328524cb85ea76193e
] =

[Handle English nouns that end in y.
builes.adolfo@googlemail.com**20100724172717
 Ignore-this: 49eed82e5949fc0d8e7d2775e9fd50c0
] =

[Make the "error applying hunk" error a lot more readable (and useful).
Petr Rockai <me@mornfall.net>**20100727215711
 Ignore-this: d748d2632528d8e95453cb8cab76cd67
] =

[Haddock promptYorn.
Eric Kow <kowey@darcs.net>**20100718092334
 Ignore-this: 35ea778f5a5e44b8fb08a1b340b6b8a0
] =

[Add header to issue1790 test and make it follow convention more.
Eric Kow <kowey@darcs.net>**20100728142928
 Ignore-this: 29e6d64c5f3089ff6b7e081da5f853a4
] =

[Accept issue1790: darcs send --context foo
Eric Kow <kowey@darcs.net>**20100728142602
 Ignore-this: cd5d7f148d32ddbcea8d8cbb2282c2ea
 Submitted by Loup Vaillant.
] =

[Modernise System.Cmd import in Distribution.ShellHarness.
Eric Kow <kowey@darcs.net>**20100725220631
 Ignore-this: a785da33c6089635da687a9bfe957c2b
] =

[Restore looking for version number in exact-version context dump.
Eric Kow <kowey@darcs.net>**20100726114810
 Ignore-this: e18459c582c12c2e77b630f096f66190
 =

 rolling back:
 =

 Sun Jul 11 13:08:54 BST 2010  Reinier Lamers <tux_rocker@reinier.de>
   * Don't look for version number in exact-version context dump
 =

 Petr says it masks a bug in the release tarballs.
] =

[rename readPatchIds to better describe what it does
Jason Dagit <dagit@codersbase.com>**20100723064832
 Ignore-this: aa207726cbe8894aab41c17bd01ee6ca
] =

[move readPatchIds to Darcs.Patch.Info
Jason Dagit <dagit@codersbase.com>**20100723064511
 Ignore-this: 53f620c0f5ffda0ffd82693c27a70235
] =

[remove duplicate code, readPatchIds
Jason Dagit <dagit@codersbase.com>**20100723063526
 Ignore-this: a1950afa8385b04aa9c03435e4c152cb
] =

[Slightly fix context generation in Setup.
Petr Rockai <me@mornfall.net>**20100722111410
 Ignore-this: eb3b6637f24d62332c9452a3c4143f39
] =

[Fix "head: empty list" bug in Darcs.Flags.RemoteDarcs.
Petr Rockai <me@mornfall.net>**20100715123140
 Ignore-this: fa172627824eb3937cad63223026db9e
] =

[Use Compression more widely, suppressing further [DarcsFlag] uses.
Petr Rockai <me@mornfall.net>**20100715003449
 Ignore-this: d582d3bc381e73a964127aa3b87d0ffb
] =

[Replace some [DarcsFlag] uses with newly introduced RemoteDarcs.
Petr Rockai <me@mornfall.net>**20100715003320
 Ignore-this: d018b8c9b328228b9d283b7ad824eb15
] =

[Remove --nolinks, since its scope and usefulness is very limited.
Petr Rockai <me@mornfall.net>**20100715000822
 Ignore-this: 71427fcd09e59d5e4f443bcc4e5ca649
] =

[Restore set-scripts-executable in trackdown --bisect.
Eric Kow <kowey@darcs.net>**20100717124222
 Ignore-this: efa2e2bba8227542b5a63933f0748c9d
 Note: Petr Rockai originally submitted this work as an amendment to
 'Remove [DarcsFlag] parameters from apply.', but I must have
 accidentally pushed the first version before he sent it.  This patch
 has the same effect as his amendment.
] =

[Remove [DarcsFlag] parameters from apply.
Petr Rockai <me@mornfall.net>**20100715002249
 Ignore-this: 707f8193561ce890dc6ed91d1001253b
] =

[Remove [DarcsFlag] argument from unrecordedChanges.
Petr Rockai <me@mornfall.net>**20100714155059
 Ignore-this: 4ba064584b4846b0ca26f6e3199a955a
] =

[Fix up tests to refer to --name instead of --patch-name.
Petr Rockai <me@mornfall.net>**20100715102618
 Ignore-this: 630cc96d79db0ee7af9c93fa3dbf5f15
] =

[Resolve issue1883: rename --patch-name option to --name.
Eric Kow <kowey@darcs.net>**20100715101608
 Ignore-this: 85ab2f1e23f8b561b323a9dfb94baa55
 This is usually used in darcs record in shorthand (-m) form.
 This rename is aimed at eliminating the confusion with the --patch
 matcher, which bites amend-record and rollback users.
] =

[get rid of join_patches
Ganesh Sittampalam <ganesh@earth.li>**20100712165037
 Ignore-this: f9a5ca3dcc690e3c1ed9f6778b07f542
] =

[stop using join_patches in Darcs.Test.Unit
Ganesh Sittampalam <ganesh@earth.li>**20100712165031
 Ignore-this: 563bbbd15f9f51cdfc8063b9dd7f8b0b
] =

[fix warning
Ganesh Sittampalam <ganesh@earth.li>**20100707061818
 Ignore-this: 4b9e468819689cfc768befa8eabe4a4f
] =

[fix unused variable warning
Ganesh Sittampalam <ganesh@earth.li>**20100707065338
 Ignore-this: b2a8e05c985912a78dc71748361271b1
] =

[fix name shadowing warning
Ganesh Sittampalam <ganesh@earth.li>**20100707065303
 Ignore-this: 79ab8367f22333f79f66e82d5f631dac
] =

[rename field names to avoid shadowing warnings
Ganesh Sittampalam <ganesh@earth.li>**20100707062714
 Ignore-this: 6be53f3ee1ef4915bdd722153b0675e0
] =

[fix unused code warning
Ganesh Sittampalam <ganesh@earth.li>**20100707062701
 Ignore-this: 3475bca718b26e5056c3ad7448a346dc
] =

[fix shadowing warnings
Ganesh Sittampalam <ganesh@earth.li>**20100707062324
 Ignore-this: 45d7d142735754357e7b9c53eb2c25df
] =

[fix warning
Ganesh Sittampalam <ganesh@earth.li>**20100707062320
 Ignore-this: 33b1a5f0d5895f04257e4eb133addfc5
] =

[fix warning
Ganesh Sittampalam <ganesh@earth.li>**20100707062315
 Ignore-this: ad3da11afad97816fcd832baf25c311f
] =

[remove dead code
Ganesh Sittampalam <ganesh@earth.li>**20100707062309
 Ignore-this: a3462879709597df56cf28d239b71eef
] =

[TAG 2.7.0
Ganesh Sittampalam <ganesh@earth.li>**20110125223134
 Ignore-this: 8b0bdf9c4ef6b414515bf0517d1e8687
] =

[TAG 2.5
Reinier Lamers <tux_rocker@reinier.de>**20101024151805
 Ignore-this: 1561ce30bfb1950a440c03371e0e2f20
] =

[TAG 2.4.99.1
Reinier Lamers <tux_rocker@reinier.de>**20101015132045
 Ignore-this: 4293f06a5a3344bc710b65253ba0c8c1
] =

[write out tag before trying to optimize inventory
Ganesh Sittampalam <ganesh@earth.li>**20101011205253
 Ignore-this: 61e712ff915b6aacaec3d7946e569fa6
 =

 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 unsea=
ling.
    (manually backpopting fix by Petr Rockai to mainline)
 =

] =

[Add entry for darcs 2.5 to NEWS file
Reinier Lamers <tux_rocker@reinier.de>**20101024151759
 Ignore-this: a8e215f0dba7d78ed0733a88eba6f2ea
] =

[No longer say that building with GHC 6.8 is possible in README
Reinier Lamers <tux_rocker@reinier.de>**20101015143439
 Ignore-this: ad9dacf3241ea1f9aa95d4ee1934c812
] =

[Bump version number to 2.5
Reinier Lamers <tux_rocker@reinier.de>**20101015142941
 Ignore-this: 4ca98852c3888fd24fcaebcb0a8b91d4
] =

[Bump version number to 2.4.99.1 for 2.5 RC 1
Reinier Lamers <tux_rocker@reinier.de>**20101015132034
 Ignore-this: c60cb21f3d183f3e1c85ad29ec36449d
] =

[Force regex-posix version to be greater than 0.94.4 on Windows to avoid li=
nking errors
Reinier Lamers <tux_rocker@reinier.de>**20101015123919
 Ignore-this: 988447e569dce8ba011a937daa391653
 =

 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 >=3D 0.94.4 on windows to avoid link errors with w=
ith HP 2010.2.0.0
     See http://trac.haskell.org/haskell-platform/ticket/137 . On windows w=
e
       now ensure a new enough version of regex-posix (which regex-compat u=
ses).
] =

[Haddock fixSubPaths
Reinier Lamers <tux_rocker@reinier.de>**20101002193447
 Ignore-this: e636f81773470f918d6aaffff477014f
] =

[Make annotate handle fixSubPath's rejecting paths
Reinier Lamers <tux_rocker@reinier.de>**20101002190600
 Ignore-this: 336e50760bc14332436e2e1ac93a0d8c
] =

[Make issue1951 test clean up (needed for 2.5 branch)
Reinier Lamers <tux_rocker@reinier.de>**20100926181410
 Ignore-this: e35a4e4997ecc009cf3377806168249
] =

[Mark issue1951 test as passing
Reinier Lamers <tux_rocker@reinier.de>**20100926180813
 Ignore-this: 5bb72adeb44e4fc6fe68098cbe799ce3
] =

[Don't act like user gave no file arguments to add when he gave only invali=
d ones
Reinier Lamers <tux_rocker@reinier.de>**20100926175604
 Ignore-this: 9fa00f5230d7be070973e7e3a7abb048
] =

[Elaborate issue1951 test (for adding files outside the repository)
Reinier Lamers <tux_rocker@reinier.de>**20100926175213
 Ignore-this: 460ee08b38d8a247379c3fa2d8edc471
] =

[resolve issue1951: refuse to add files outside repository
Reinier Lamers <tux_rocker@reinier.de>**20100926172901
 Ignore-this: 906eca5d6a62c103b3e423967b37570d
 =

 Instead of passing on relative paths to hashed-storage if they are not
 meaningful relative to the repository root, we now turn all relative paths=
 into
 absolute paths. We do that by chdir'ing to them from either the current wo=
rking
 directory, or if that fails, the repository root.
] =

[Resolve issue1942: fix the fix which ended up too strict due to unsealing.
Dmitry Astapov <dastapov@gmail.com>**20100911185355
 Ignore-this: 87012509b3c1c0137306b348ae585059
 (manually backpopting fix by Petr Rockai to mainline)
] =

[Accept issue1951: add outside of current repository.
Eric Kow <kowey@darcs.net>**20100908095448
 Ignore-this: 5085d7647e9408ea7b5282e1cb0d1079
 Regression between darcs 2.4 and 2.4.98.5.
] =

[TAG 2.4.98.5
Reinier Lamers <tux_rocker@reinier.de>**20100905170906
 Ignore-this: 848f746fa6a939cef069abe6722d4206
] =

[Bump version number to 2.4.98.5
Reinier Lamers <tux_rocker@reinier.de>**20100905170855
 Ignore-this: dfb020e93dd32bb205f338a27862d42d
] =

[Clean up trackdown --bisect documentation.
Eric Kow <kowey@darcs.net>**20100830125530
 Ignore-this: e51acdad91cb83ac6e06552a66f45e1b
] =

[remove --index option from matchOneNontag because issue1926
Iago Abal <iago.abal@gmail.com>**20100901161448
 Ignore-this: 5e3911031baa219dab159eb263a2a9cf
 Removed for 2.5 release to avoid showing options to the user that are not =
implemented.
] =

[Resolve issue1942: Fix an IO interleaving bug in old-fashioned readRepo.
Petr Rockai <me@mornfall.net>**20100904030947
 Ignore-this: d89716791fecb518f530fcf1b1924a9f
] =

[Document GHC 6.10 dependency.
Eric Kow <kowey@darcs.net>**20100825152443
 Ignore-this: 9714d0bd6abd20a521b7f8f86be274f7
] =

[Relax the hashed-storage dependency (to >=3D 0.5.2 && < 0.6).
Petr Rockai <me@mornfall.net>**20100824081630
 Ignore-this: 754a9cb5d02cf8771df0905e976cc6e
] =

[TAG 2.4.98.4
Reinier Lamers <tux_rocker@reinier.de>**20100823183505
 Ignore-this: 8257375d159e0d5a8cb548c6374adf39
] =

[resolve issue1815: work around Cabal sdist permissions issue
Reinier Lamers <tux_rocker@reinier.de>**20100823183454
 Ignore-this: e8e9a63a9cdeaea1332c961cdba61b09
] =

[Fix tests that were broken by issue1898 fix.
Eric Kow <kowey@darcs.net>**20100815202529
 Ignore-this: f25c2aaed8c0063cee2f31c179345190
 These tests were confused by Darcs UI messages.
] =

[Fix tests that were broken by issue1875 fix.
Eric Kow <kowey@darcs.net>**20100815202223
 Ignore-this: bd6e7066799e39f3529a485f6fbeed42
 =

 The tests were assuming --set-default.  As these are artifical repositorie=
s for
 test cases, we sometimes have cases where we pull/push from freshly create=
d
 repositories with no defaultrepo.
] =

[Resolve issue1898: notify user when they can use set-default.
Eric Kow <kowey@darcs.net>**20100812155901
 Ignore-this: 638b575b32d700cfae9f057293cd5aa8
] =

[Fix the remote-repo flag if it's not a URL.
Eric Kow <kowey@darcs.net>**20100812150920
 Ignore-this: 10082e2dc200ece25ece1519242962e2
 The word 'fix' here refers to the filepath canonicalisation mechanism
 that makes it easier to check filepath equality.
] =

[Resolve issue1875: avoid accidentally setting default.
Eric Kow <kowey@darcs.net>**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 <kowey@darcs.net>**20100812154827
 Ignore-this: 127842d85545f411ce71e8d065d2c268
] =

[Accept issue1875: darcs does not honor no-set-default on fetch.
Eric Kow <kowey@darcs.net>**20100812152637
 Ignore-this: 32573c47c25ec3e5ad187a5537f50c73
] =

[Accept issue1898: set-default notification system.
Eric Kow <kowey@darcs.net>**20100811141903
 Ignore-this: d33212de428eaf5e2fd85aa4a6cc644a
] =

[resolve issue1913: sort changes in treeDiff
Ganesh Sittampalam <ganesh@earth.li>**20100819211941
 Ignore-this: 3693df699c664a8f47dc0e0f974c9b7d
] =

[generalise the type of treeDiff
Ganesh Sittampalam <ganesh@earth.li>**20100819064152
 Ignore-this: 1b01d02a3581c8967ac612d2d725d8ad
] =

[make issue1913 test actually fail
Ganesh Sittampalam <ganesh@earth.li>**20100819060251
 Ignore-this: 1f27289bbdb87b0d3c8ce5793d19d232
] =

[Accept issue1913: buggy mapPrimFL.
Eric Kow <kowey@darcs.net>**20100810173448
 Ignore-this: 298f8bb5a3dbebafd6de809593a077fb
] =

[TAG 2.4.98.3
Reinier Lamers <tux_rocker@reinier.de>**20100815194519
 Ignore-this: e3a3c30d7dd2fbe49c846c48510a9c3c
] =

[resolve issue1924: remove output options of obliterate
Reinier Lamers <tux_rocker@reinier.de>**20100815192010
 Ignore-this: b85544067119c5c80db2ef449aea8456
] =

[Bump version number to 2.4.98.3
Reinier Lamers <tux_rocker@reinier.de>**20100809062707
 Ignore-this: 21537d06e0658cd9a44108b1ddb81942
] =

[Also set binary mode on stderr (duplicate for 2.5 branch)
Reinier Lamers <tux_rocker@reinier.de>**20100810193256
 Ignore-this: 5f1ed1efaff91967b340cfc51afa6ac5
] =

[TAG 2.4.98.2
Reinier Lamers <tux_rocker@reinier.de>**20100726184946
 Ignore-this: 43a9f17e811c2172be76fb1b19aa1497
] =

[Rollback change that allowed --exact-version without context in release
Reinier Lamers <tux_rocker@reinier.de>**20100725131540
 Ignore-this: d2e471bfb2edfc664697154519674f3a
] =

[Bump version number to 2.4.98.2
Reinier Lamers <tux_rocker@reinier.de>**20100725125520
 Ignore-this: daa7f079bf12a4809705d1d8ff3cc681
] =

[Resolve issue1290: support diff --index.
Eric Kow <kowey@darcs.net>**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 <kowey@darcs.net>**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 <me@mornfall.net>**20100807171552
 Ignore-this: 8d66f660e691ffe76a8da1eab9e5dcc9
] =

[Accept issue1909: unrecord -O in a tagged repo makes a bad bundle.
Petr Rockai <me@mornfall.net>**20100807171245
 Ignore-this: d8b2d7563cd4612814a209a515358cb4
] =

[Do not fail when there's debris in tests directory.
Petr Rockai <me@mornfall.net>**20100807192133
 Ignore-this: d1fdf93fbed39e3a20bb8d4129dbd4d4
] =

[Restyle issue1873 test and make it run in darcs 2.4.
Eric Kow <kowey@darcs.net>**20100807171741
 Ignore-this: 32d1c90bbb45ab91fd3803dc513bc751
 Just to confirm the regression...
] =

[Add test for issue1873 (failed to read patch during apply).
Petr Rockai <me@mornfall.net>**20100807163013
 Ignore-this: 2396ff7f429204f6f10079fb32799e32
] =

[Resolve issue1873: give nicer error when apply fails due to missing patche=
s.
Petr Rockai <me@mornfall.net>**20100804204010
 Ignore-this: b3ddfddeaa7e089717256aa2344ba78c
] =

[Rename findCommonAndUncommon to findUncommon (it does not find common).
Petr Rockai <me@mornfall.net>**20100804195738
 Ignore-this: 8257db493418179be45fad17ab6ffd8e
] =

[Accept issue1290: darcs diff --index support.
Eric Kow <kowey@darcs.net>**20100805124559
 Ignore-this: 560bf7125a441de79f0939e5851b95ed
] =

[Resolve issue1892: Improve safety of makeBundle* and fix a couple of relat=
ed bugs.
Petr Rockai <me@mornfall.net>**20100715093842
 Ignore-this: 9eaa26edfdda09ac444f124130b9e74b
] =

[Export usageHelper
Joachim Breitner <mail@joachim-breitner.de>**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 <mail@joachim-breitner.de>**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 <tux_rocker@reinier.de>**20100802181249
 Ignore-this: 87d2c72fc74e4442f146d896296fb0db
] =

[Resolve issue1888: fix changes --context.
Petr Rockai <me@mornfall.net>**20100729185143
 Ignore-this: eed1a926b468492198547c438a85e2c9
] =

[Disable optimize --http for Darcs 2.5 release.
Eric Kow <E.Y.Kow@brighton.ac.uk>**20100726111249
 Ignore-this: 92b75e71ac3041eee76762bf8042b02c
] =

[Disable packs for darcs 2.5.
Eric Kow <E.Y.Kow@brighton.ac.uk>**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 <tux_rocker@reinier.de>**20100722191846
 Ignore-this: 24a12e1cf2631b5363636cf32cf5e8da
   =

 Reading RFC822, it seems all-whitespace lines are allowed in the header se=
ction
 when you've got trailing space that doesn't fit on the line before.
] =

[Remove [DarcsFlag] usage from Darcs.Patch.Bundle.
Petr Rockai <me@mornfall.net>**20100715081908
 Ignore-this: 62297671dea56fdc0a1cac42f79d6d29
] =

[resolve issue1893: move fields of conditional builds within scope of condi=
tion
Ganesh Sittampalam <ganesh@earth.li>**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 <kowey@darcs.net>**20100713174550
 Ignore-this: 3546359aec588d1262d6335b033331d0
] =

[move main unit testing code into module with proper name (not Main)
Ganesh Sittampalam <ganesh@earth.li>**20100707180600
 Ignore-this: 9c44b4ab083ba44afc9ecaf0752cd130
 This is enable other things than the unit executable to import it
 =

] =

[Fix haddock error.
Eric Kow <kowey@darcs.net>**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 <kowey@darcs.net>**20100712142926
 Ignore-this: 97dc0a40b82f9360d374917e243e0490
] =

[Resolve issue1887: add a missing newline to --list-options output.
Petr Rockai <me@mornfall.net>**20100711193535
 Ignore-this: 912b18e8f89be19d186332f5f98a8083
] =

[Fix conflict in Distribution.ShellHarness.
Eric Kow <kowey@darcs.net>**20100712132814
 Ignore-this: bfde365cf2d74b05d29ed457b5382f46
 Was between extended test defaults and Control.OldException removal.
] =

[Fix tests in light of recent default flag changes.
Petr Rockai <me@mornfall.net>**20100708195100
 Ignore-this: b8764f2105ed6e7870f4853041b90f9e
] =

[Correctly handle conflicts arising from DarcsMutuallyExclusive options.
Petr Rockai <me@mornfall.net>**20100708194904
 Ignore-this: b6607175899ad6f63044adae7442fd6d
] =

[Avoid adding noCache twice to parameter lists.
Petr Rockai <me@mornfall.net>**20100708195014
 Ignore-this: 59cf4dc50edb4c08367cbc29f321e431
] =

[Make --no-cache an advanced option in all commands.
Eric Kow <kowey@darcs.net>**20100701161428
 Ignore-this: 99ea6f8e2235bfdab407a1af9fcfb5cc
] =

[Do not set default repo by default in push, pull, send, fetch.
Eric Kow <kowey@darcs.net>**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 <kowey@darcs.net>**20100701160138
 Ignore-this: 189522de144a9b9b81239f4a5ff545f0
] =

[Make --edit-description the default.
Eric Kow <kowey@darcs.net>**20100701155253
 Ignore-this: ed99469237da51949d915a8dda13706e
] =

[Express --{no-,}edit-description as a mutually exclusive option.
Eric Kow <kowey@darcs.net>**20100701155045
 Ignore-this: 419cc3945f89953e33400172d51453e9
] =

[Add a notion of mutually exclusive options with a default.
Eric Kow <kowey@darcs.net>**20100701155041
 Ignore-this: e3a29afebe21c9ec6ce355040260e8b
] =

[General purpose function for setting defaults.
Eric Kow <kowey@darcs.net>**20100701151816
 Ignore-this: d76a09aa70eba9694d3649300ef7720d
] =

[Fix use of atomicOptions in Darcs.ArgumentDefaults.
Eric Kow <kowey@darcs.net>**20100701144916
 Ignore-this: 4fc1df15e34b5c63c47e4c12c4f5963
] =

[Update optimizeHTTP for new two-layer DarcsOption.
Eric Kow <kowey@darcs.net>**20100701142543
 Ignore-this: d892c6787ba0aa93a0b36c1e7a79b756
] =

[Refactor traversal of atomic options in DarcsOption.
Eric Kow <kowey@darcs.net>**20100621003601
 Ignore-this: 9425a65b80f075e684fd7edaf9b5b868
] =

[Better use of Data.Maybe helpers in Darcs.Arguments.
Eric Kow <kowey@darcs.net>**20100621002200
 Ignore-this: 46feb16524e1d61495a7ead46cce1e55
] =

[Flatten DarcsOption type.
Eric Kow <kowey@darcs.net>**20100621001926
 Ignore-this: 34a3e0c2a9e989f0f35774d742607c93
 Distinguish between DarcsAtomicOptions and DarcsOption.
] =

[Fix missing type signature.
Eric Kow <kowey@darcs.net>**20100701153511
 Ignore-this: a0669588aca19f0c45326c1244e1c766
] =

[Rename optionFromDarcsoption to optionFromDarcsOption.
Eric Kow <kowey@darcs.net>**20100621000207
 Ignore-this: d1c5a5cb84264a404b9b07c9094f96aa
] =

[Fix test issue1865-get-context.sh
Thorkil Naur <naur@post11.tele.dk>**20100711121938
 Ignore-this: c68995d55efb6095ada7c24ce0909716
] =

[remove redundant and accidentally checked in definition
Ganesh Sittampalam <ganesh@earth.li>**20100709214141
 Ignore-this: d8ad150be87b467f92721c8079158541
] =

[remove dead code
Ganesh Sittampalam <ganesh@earth.li>**20100708055640
 Ignore-this: 86104cf3f14952869be820f66f156fbb
] =

[standardize GHC options
Ganesh Sittampalam <ganesh@earth.li>**20100707180210
 Ignore-this: b088f0ece12b86980225d81b37d89251
] =

[add comment about why we're using a deprecated option
Ganesh Sittampalam <ganesh@earth.li>**20100707061805
 Ignore-this: eb1ec29ce345f96689d39f8f9638987c
] =

[stop using Control.OldException in Setup.lhs + deps
Ganesh Sittampalam <ganesh@earth.li>**20100707060932
 Ignore-this: ab49b67e05941402304aed3a8b55f52f
] =

[TAG 2.4.98.1
Reinier Lamers <tux_rocker@reinier.de>**20100711120953
 Ignore-this: 6955d46fb3e48bc5bb0f622e495eae1f
] =

[Don't look for version number in exact-version context dump
Reinier Lamers <tux_rocker@reinier.de>**20100711120854
 Ignore-this: a0e461bbfed6841aa50a4a4b61ad24e9
 =

 It's not there because darcs releases are built from a dist tarball, not f=
rom
 a repo.
] =

[Bump version number to 2.4.98.1
Reinier Lamers <tux_rocker@reinier.de>**20100711111247
 Ignore-this: d98802763c6f4147476a47608857214f
] =

[Include minimal-darcs-2.4.tgz in distribution
Reinier Lamers <tux_rocker@reinier.de>**20100711114049
 Ignore-this: 995cd8feb946d62642704db8869f93ad
] =

[Resolve issue1865: make scanBundle produce a well-formed PatchSet.
Petr Rockai <me@mornfall.net>**20100709102438
 Ignore-this: d25580a6ed72fa218b63b947838a8a1a
 =

 When a context files ends in a tag, this has to be a clean tag, so we brea=
k it
 out into a separate (empty) Tagged, which makes with_partial_intersection =
work
 correctly on the result.
] =

[Resolve issue1288: the main darcs code now compiles and runs with witnesse=
s
Ganesh Sittampalam <ganesh@earth.li>**20100706192542
 Ignore-this: d98c7c5db6b6cdd72da8e9693ab25385
] =

[remove final bits of witness conditionalisation
Ganesh Sittampalam <ganesh@earth.li>**20100706174006
 Ignore-this: ea9b014f0cb63f8cc7f9b76a7abdf700
] =

[fix witnesses in resolveConflicts
Ganesh Sittampalam <ganesh@earth.li>**20100706055829
 Ignore-this: e5b4bd92eb54a4acad6f77ade9afd252
] =

[add witnesses to glump09
Ganesh Sittampalam <ganesh@earth.li>**20100706054016
 Ignore-this: c5bd140749684d3ff12a65573ffa83c9
] =

[add witnesses to actualMerge
Ganesh Sittampalam <ganesh@earth.li>**20100706052610
 Ignore-this: c6f17ffb59d3f0e76b15ea0d1395be28
] =

[make mapPrimFL work with witnesses
Ganesh Sittampalam <ganesh@earth.li>**20100705174807
 Ignore-this: ddc0bdcff565edc860235edeb6df24c4
] =

[reduce scope of GADT_WITNESSES guard
Ganesh Sittampalam <ganesh@earth.li>**20100705062514
 Ignore-this: c2472ad856f70522070d56597af6cf0e
] =

[add a comment
Ganesh Sittampalam <ganesh@earth.li>**20100629064727
 Ignore-this: 1cf1edbfc1df0959bce3d3d168f7cede
] =

[move unsafeFL definition to its one remaining use site
Ganesh Sittampalam <ganesh@earth.li>**20100622061243
 Ignore-this: f94b11d5d813928e6472ea4abee83605
] =

[rename unsafeUnflippedseal for consistency
Ganesh Sittampalam <ganesh@earth.li>**20100421055157
 Ignore-this: f49496680cc94aa4831c9e4be14c36af
] =

[remove witnesses conditionalisation from unravel
Ganesh Sittampalam <ganesh@earth.li>**20100420170624
 Ignore-this: 2e456fb17733f48ddb1ced15b936df8
] =

[add witnesses to get_supers
Ganesh Sittampalam <ganesh@earth.li>**20100420064933
 Ignore-this: ec053690f0058e216e53f32e7f104229
] =

[drop GADT_WITNESSES conditionalisation of [other_]commute_recursive_merger
Ganesh Sittampalam <ganesh@earth.li>**20100420062900
 Ignore-this: 47679eda25d84bf396743eb46f7fb426
] =

[drop redundant part of testcases
Ganesh Sittampalam <ganesh@earth.li>**20100330175639
 Ignore-this: c76c26bfc60787d7e6feee21a459edf3
] =

[Don't pipe stuff into a process that never reads it.
Petr Rockai <me@mornfall.net>**20100707142605
 Ignore-this: 5846b33371b593b8e6cb09b4d6b834f
] =

[Fail more verbosely in network/issue1503 test.
Petr Rockai <me@mornfall.net>**20100707141120
 Ignore-this: c855c2e9f9b996ab475bf8382b481272
] =

[Enable pipefail globally in tests.
Petr Rockai <me@mornfall.net>**20100707141110
 Ignore-this: f1a86e79baac57ffceea6c1c7044f3ad
] =

[drop headFL
Ganesh Sittampalam <ganesh@earth.li>**20100420064704
 Ignore-this: 140c2baeaf92b3d946b6bee3c8d6b1d7
] =

[drop GADT_WITNESSES conditionalisation of new_ur
Ganesh Sittampalam <ganesh@earth.li>**20100420064655
 Ignore-this: d06d4cca5c0b65d71fb3e04a3a8120bf
] =

[drop GADT_WITNESSES conditionalisation of unwind
Ganesh Sittampalam <ganesh@earth.li>**20100420064601
 Ignore-this: 15187027a1ab7b39bbb239b6797d9fc
] =

[drop GADT_WITNESSES conditionalisation of merger_commute
Ganesh Sittampalam <ganesh@earth.li>**20100420062907
 Ignore-this: b6961b8e37c0e37fccdad2695833647f
] =

[drop GADT_WITNESSES conditionalisation in Darcs.Patch.Read
Ganesh Sittampalam <ganesh@earth.li>**20100420062854
 Ignore-this: 7e07f79ea128daa83a4fc8370d9bd164
] =

[add dummy implementation of merger
Ganesh Sittampalam <ganesh@earth.li>**20100420062821
 Ignore-this: cf01eab70323d9deb996d77a810652a9
] =

[push witnesses error from public_unravel into unravel
Ganesh Sittampalam <ganesh@earth.li>**20100420062431
 Ignore-this: 9c460024d29483f9f38527f01ce37fc0
 =

] =

[move instance to Darcs.Witnesses
Ganesh Sittampalam <ganesh@earth.li>**20100401181500
 Ignore-this: f348b91366025af4e5ab9ed0ec37f57
] =

[drop headRL
Ganesh Sittampalam <ganesh@earth.li>**20100401171533
 Ignore-this: 309bf478f87d6fb3c3eb204cbdec8866
] =

[add type signature for actual_merge'
Ganesh Sittampalam <ganesh@earth.li>**20100401061646
 Ignore-this: 5b71d1cd8249b4e949ec695f8b4b2d5b
] =

[drop spurious semicolon
Ganesh Sittampalam <ganesh@earth.li>**20100401055811
 Ignore-this: 6e4907b0b4620cb4df80773a7f8f020b
] =

[drop GADT_WITNESSES conditionalisation of commute_no_merger
Ganesh Sittampalam <ganesh@earth.li>**20100401051137
 Ignore-this: 649ac3eee7cb69a0c0d77be2018ee41b
] =

[remove some GADT_WITNESSES conditionalisation
Ganesh Sittampalam <ganesh@earth.li>**20100331052706
 Ignore-this: b8e15cc990c3235b80d3d35f8f27d610
] =

[GHC 6.10 build fix: don't use GADT records
Ganesh Sittampalam <ganesh@earth.li>**20100706210106
 Ignore-this: 860a7defcadaadc9b1227e4e182c0197
 =

 This could be rolled back once we drop GHC 6.10, but on the other hand the
 code looks ok like this too so it's probably not worth it.
 =

] =

[change test to not remove directories afterwards
Ganesh Sittampalam <ganesh@earth.li>**20100320171120
 Ignore-this: 278c14d752c7ee95abea75db2e605e
] =

[add unsafeCoercePStart/End
Ganesh Sittampalam <ganesh@earth.li>**20100622061120
 Ignore-this: 47af77dca8b59d20cd647c71fe8145e7
] =

[export unsafeUnseal etc with GADT_WITNESSES
Ganesh Sittampalam <ganesh@earth.li>**20100331051224
 Ignore-this: 20e7fe490979cf353c37ffb3638c64a6
] =

[a couple more MyEq instances
Ganesh Sittampalam <ganesh@earth.li>**20100331051006
 Ignore-this: 1781065c68da4c88bc1dc6a87054943a
] =

[use packStringLetters Show hack for RepoModel
Ganesh Sittampalam <ganesh@earth.li>**20100331050931
 Ignore-this: 3cfdbd7eef3fffaaac5fd4f5912e3eb3
] =

[move Show2 Patch instance to Darcs.Patch.Show
Ganesh Sittampalam <ganesh@earth.li>**20100331050507
 Ignore-this: 721f2df4289f3895de80005daac077c
] =

[rework Show<n> classes to be more flexible
Ganesh Sittampalam <ganesh@earth.li>**20100107182841
 Ignore-this: 2f744fb2a61a87349077ebeef826e767
] =

[packStringLetters Show hack needs to use Char8
Ganesh Sittampalam <ganesh@earth.li>**20100107182733
 Ignore-this: 8ba1df0d35a40114f0effa81c7c081ff
] =

[drop a few unsafeFL uses
Ganesh Sittampalam <ganesh@earth.li>**20100323070946
 Ignore-this: d99b1955e229fc778f0e6eb0450690e2
] =

[drop some unused unsafe functions
Ganesh Sittampalam <ganesh@earth.li>**20100322011008
 Ignore-this: ec1cea0fccb35d678509ee0728459a14
] =

[switch Darcs.Test.Patch.QuickCheck to use Origin type
Ganesh Sittampalam <ganesh@earth.li>**20100322010749
 Ignore-this: 64eca6fc037edb4355fe60a87d0c9542
] =

[add Darcs.Test.Patch.QuickCheck to witnesses build
Ganesh Sittampalam <ganesh@earth.li>**20100322010646
 Ignore-this: 9deb7c235f4150dddf8378c95ed46e10
] =

[remove unused instance
Ganesh Sittampalam <ganesh@earth.li>**20100322005815
 Ignore-this: 3e8b30ab0e264525559e8e7eab2ba0bf
] =

[replace 'assert' function with equivalent 'guard' from Control.Monad
Ganesh Sittampalam <ganesh@earth.li>**20100321234817
 Ignore-this: 4355f4a4d2c6c1947789df93fb01866e
] =

[don't re-export unravel/merger in Darcs.Patch
Ganesh Sittampalam <ganesh@earth.li>**20100321233037
 Ignore-this: faaa49bb4e0a152e3b4ffda8bad2eab5
] =

[remove conditionalisation of imports on GADT_WITNESSES for simplicity
Ganesh Sittampalam <ganesh@earth.li>**20100321221947
 Ignore-this: 56005a5e19f48ee89468bb014c344e1c
] =

[push GADT_WITNESSES conditionalisation down into actual_merge definition
Ganesh Sittampalam <ganesh@earth.li>**20100321221757
 Ignore-this: 6822aefaa1013a64ad78b06cfcac8686
] =

[drop GADT_WITNESSES conditionalisation for clever_commute
Ganesh Sittampalam <ganesh@earth.li>**20100321203424
 Ignore-this: 609199cebe7a753fd3c9dc1b51c48015
] =

[drop GADT_WITNESSES conditionalisation in modernizePatch
Ganesh Sittampalam <ganesh@earth.li>**20100321203317
 Ignore-this: 52dc874f599f544beca392cef1716023
] =

[Resolve issue1726: Files with _darcs prefix are always boring
David Markvica <david@blueshellturtle.com>**20100625093202
 Ignore-this: d234fe8c508eae75173b30f8bf0eeb61
] =

[Resolve issue1825: do not omit important prims in unrecordedChanges w/ fil=
es.
Petr Rockai <me@mornfall.net>**20100628211355
 Ignore-this: 6948f29fe09882ec719269b21fc50ae7
 =

 This is a rather heavy-handed fix. We stop filtering the pending patch in
 unrecordedChanges -- overall, this is an optimisation, since we can now av=
oid
 reading the pending patch twice, and in most cases we also avoid filtering=
 that
 part of the patch twice. However, in exchange, whatsnew now has to filter =
the
 patch (this was not required previously). This may be slightly less effici=
ent
 for diffs with very many changed files: however, it is unlikely to be a
 bottleneck, since computing and even formatting the patches for display is=
 much
 more expensive.
] =

[Avoid explicit add of an utf8-encoded file in issue1763 test.
Petr Rockai <me@mornfall.net>**20100702143819
 Ignore-this: 4a1cb11a6015feac0e6829a41fd76b98
] =

[Add a number of missing --test parameters to the testsuite.
Petr Rockai <me@mornfall.net>**20100702143038
 Ignore-this: 70894f33c7f2a401f20e81cc7303a639
] =

[Make --no-test default for record, amend and check.
Eric Kow <kowey@darcs.net>**20100602171100
 Ignore-this: d596d6f5c9a79c51712e8ede11d98931
] =

[Better darcs-specific mailing list for update_roundup.pl.
Eric Kow <kowey@darcs.net>**20100701211254
 Ignore-this: 8c19c4c9d8b842b83cc08b19b98ff2d2
 Sending to @darcs.net from darcs.net does not currently work due to lists
 acutally being hosted by osuosl.  Presumably it is possible to configure
 darcs.net to support this correctly, but for now this is the path of least
 resistance.
] =

[Resolve issue1845: fix "darcs record f" for f a removed, version-tracked f=
ile.
Petr Rockai <me@mornfall.net>**20100628144932
 Ignore-this: 6c13d9e337c0f5df4321dd71640b9bc6
] =

[Resolve issue1871: announceFiles should not give empty list for ".".
Petr Rockai <me@mornfall.net>**20100628143903
 Ignore-this: d73c53486d8a7d31d96287b65eed0fdd
] =

[stop using impredicativity
Ganesh Sittampalam <ganesh@earth.li>**20100626163016
 Ignore-this: 5335c81d72e98503234536c1348dad70
 This is planned to be removed or changed in GHC 6.14
 =

] =

[Docstring typo fix
Jonathan Daugherty <drcygnus@gmail.com>**20091114190050
 Ignore-this: f1fd72458424be5687ab4e4132408edf
] =

[Remove apparant trailing noise in documentation on sources.
Eric Kow <kowey@darcs.net>**20100426175705
 Ignore-this: 13a9de6d6bf72bfe4c1b790ba81eee63
] =

[Remove advice to create a global cache (we create one by default).
Eric Kow <kowey@darcs.net>**20100426175645
 Ignore-this: 17af99680fb98908487675bca949b771
] =

[Use temporary files in doOptimizeHTTP
Alexey Levan <exlevan@gmail.com>**20100628173302
 Ignore-this: 7fc61ee1e09df8c0a7202a9125555649
] =

[Add support for lazy getting a packed repository
Alexey Levan <exlevan@gmail.com>**20100628083323
 Ignore-this: ad33128cca089ef3b7f1a86c3050a09a
] =

[Don't use packs when getting a local repository
Alexey Levan <exlevan@gmail.com>**20100627023834
 Ignore-this: 5c7113972b690c5852c47a27fb19a93
] =

[Fix warning in Darcs.Repository
Alexey Levan <exlevan@gmail.com>**20100624183910
 Ignore-this: ba3a3c9b9470c8361cc666953da64efe
] =

[Decrease memory consumption while packing a repo
Alexey Levan <exlevan@gmail.com>**20100625021231
 Ignore-this: ff5a37463419cea28a12af3a5244c623
] =

[Generalise mechanism for distinguishing between bad and non repos.
Eric Kow <kowey@darcs.net>**20100621182834
 Ignore-this: 85bb5cfee6f8955eedea4cd438603e2d
 We remove the potentially misleading currentDirIsRepository along
 the way.
] =

[Extend issue1277 test for more prerequisites.
Eric Kow <kowey@darcs.net>**20100621182016
 Ignore-this: 49548f2470cd22133cecca1c5458b1d9
] =

[Resolve issue1277: percolate repository format errors correctly.
Eric Kow <kowey@darcs.net>**20100618185423
 Ignore-this: b541efa39c3b55b67479b209f55ffd1d
 The problem is that we do not distinguish between bad repos and
 non-repositories so we keep seeking upwards.
] =

[Accept issue1277: darcs repository format errors not reported in add. =

Eric Kow <kowey@darcs.net>**20100618190106
 Ignore-this: d0961642c7526643b98a5ed066434288
] =

[Allow BL.readFile through haskell_policy for now.
Petr Rockai <me@mornfall.net>**20100626200620
 Ignore-this: a9ea5e68c451661ae38b2760b50c743b
 =

 The other option would be to introduce a RatifiedBL module (since Ratified
 already exports readFile), which may be rather heavyweight. We can't renam=
e the
 function in Ratified, since that also triggers an hlint error.
] =

[Fix witnesses after Alexey's optimize --http work.
Petr Rockai <me@mornfall.net>**20100626195810
 Ignore-this: 7184c202d8cd4bf755c1c4fd3d48e341
] =

[Implement darcs optimize --http
Alexey Levan <exlevan@gmail.com>**20100624183811
 Ignore-this: 36279836885c312f2670da414cf67710
] =

[Create a function for lazy fetching of files
Alexey Levan <exlevan@gmail.com>**20100624180146
 Ignore-this: 9bcd3848e92acd93ead746e947425f9f
] =

[Refactor Darcs.Repository.copyInventory (consistent naming)
Alexey Levan <exlevan@gmail.com>**20100624172822
 Ignore-this: f8db4c89dc9d1232ee3995ba0aa5d1b0
] =

[Add --http flag for optimize
Alexey Levan <exlevan@gmail.com>**20100603115900
 Ignore-this: 9830ae1b90bf225fc4ce96fc5d63506f
] =

[Fix underquoted get.sh...
Petr Rockai <me@mornfall.net>**20100625053841
 Ignore-this: c201c8a73a9290912d2e58dd82843d39
] =

[More robust distinction between basic and advanced chars in prompt.
Eric Kow <kowey@darcs.net>**20100611180807
 Ignore-this: 251fe55272cf517f20ff01c5d872395d
 As suggested by Florent Becker during review.
] =

[Resolve issue1713: shorter interactive prompts.
Eric Kow <kowey@darcs.net>**20100505095342
 Ignore-this: bfa234bf337140af441f59958ff72c7b
 =

 For example, instead of asking
   Shall I record this change? (1/8)  [ynWesfvplxdaqjk], or ? for help:
 we ask
   Shall I record this change? (1/8)  [ynW...], or ? for more options:
 =

 The goal is to make the most important options visible while making it
 evident that there are more advanced features to be used.
 =

 NB: one principle we try to respect is that the default choice should
 appear in the window of basic choices.
] =

[Make promptCharFancy easier to extend.
Eric Kow <kowey@darcs.net>**20100504153154
 Ignore-this: 709ac11d2884f9618cd9c755b9109c97
] =

[Camel case Darcs.SelectChanges.
Eric Kow <kowey@darcs.net>**20100505095640
 Ignore-this: 38a462ddafc1ce5e4a898bc9180a1852
] =

[Rename Darcs.Utils.promptCharFancy to promptChar.
Eric Kow <kowey@darcs.net>**20100504163216
 Ignore-this: f4c68187e3e4ad5f5a5cb850ce12f269
] =

[Accept issue1865: cover the interaction of get --context with tags.
Petr Rockai <me@mornfall.net>**20100623210506
 Ignore-this: efff1fb1cbd729f18e9b6e984fa37e30
] =

[Mark issue1610 test as failing again (like it should be).
Eric Kow <kowey@darcs.net>**20100623154148
 Ignore-this: 6588427de8ff8299c48a84755040aec7
 (Previously, it was a spuriously passing case)
] =

[Resolve issue1879: notice unexpected commute failure on merge.
Eric Kow <kowey@darcs.net>**20100623150418
 Ignore-this: ee25219b305f2d01d21404c55fa24342
 Fixed by Petr's 3-way partitionFL.
] =

[Accept issue1879: failing to notice unexpected commute failure.
Eric Kow <kowey@darcs.net>**20100623150308
 Ignore-this: af80523a0c2c3e837250df01e6ae8a0e
] =

[Make partitionFL do a 3-way split, and detect commutation bugs in Depends.
Petr Rockai <me@mornfall.net>**20100607195912
 Ignore-this: b692fb774356bab221442b938d8b4347
] =

[Fix progress message in tentativelyMergePatches.
Eric Kow <kowey@darcs.net>**20100623102026
 Ignore-this: 341b1f1bae701def4b94787c79d83271
] =

[Clarify merge2FL haddock.
Eric Kow <kowey@darcs.net>**20100623102015
 Ignore-this: 614eddc60d7062f758e5b21c10bc0160
] =

[Use merge2FL instead of plain merge in tentativelMergePatches.
Petr Rockai <me@mornfall.net>**20100607184934
 Ignore-this: 9fde612f399cab5553e9cf57e0764685
] =

[fix witnesses
Ganesh Sittampalam <ganesh@earth.li>**20100622060028
 Ignore-this: 6dd5bf67b0da08ed29524e75b10c4d4f
] =

[use shell negation properly in issue1877 test
florent.becker@ens-lyon.org**20100622115449
 Ignore-this: 30feb832b41afa193afcd952479bb1bc
] =

[Mark issue1877 test as passing.
Eric Kow <kowey@darcs.net>**20100622095020
 Ignore-this: 5d4bbbfe3fc08939db0c9715f6594457
] =

[resolve issue1877: make pull --dry-run --xml terse
florent.becker@ens-lyon.org**20100622085936
 Ignore-this: 25bcdaa4e30f3c82b7e5a74900a905c8
] =

[Added test for issue 1503: prefer local caches to remote ones
builes.adolfo@googlemail.com**20100608013313
 Ignore-this: 3af3ed0fc7b32e18fb5d170aa26671b5
] =

[Remove trailing whitespaces in test helper code.
Eric Kow <kowey@darcs.net>**20100621174246
 Ignore-this: b2a9ceadf133a8f06c01c0ef59e4ee7f
] =

[Remove trailing whitespaces in Darcs.Witnesses.Ordered.
Eric Kow <kowey@darcs.net>**20100621174230
 Ignore-this: 1a42f96dd82508fd310b8ac70a8d684c
] =

[Remove trailing whitespaces in Darcs.Test.Patch.Check.
Eric Kow <kowey@darcs.net>**20100621174212
 Ignore-this: 729cc019d3c75f557d713e84dc89fa8b
] =

[Remove trailing whitespace in src/Darcs/*
Eric Kow <kowey@darcs.net>**20100621174134
 Ignore-this: 6fa21d3fee4a472c47788f8fc7349647
] =

[Remove trailing whitespace in src/*
Eric Kow <kowey@darcs.net>**20100621174043
 Ignore-this: 14842203247e3b27d444ba2f9d6441dd
] =

[Remove trailing whitespace in date matching code.
Eric Kow <kowey@darcs.net>**20100621173929
 Ignore-this: aea4e065ad9264982643d5b410e1ccab
] =

[Remove trailing whitespace in Darcs.Repository and submodules.
Eric Kow <kowey@darcs.net>**20100621173832
 Ignore-this: 4877e910860f659ecad3090ba1b32c46
] =

[Remove trailing whitespace in Darcs.Patch and submodules.
Eric Kow <kowey@darcs.net>**20100621173649
 Ignore-this: a2a90a084a462bd8e4dc8547114125b8
] =

[Remove trailing whitespace in Darcs.Commands and submodules.
Eric Kow <kowey@darcs.net>**20100621173425
 Ignore-this: fd0d2afaa438a03688860f802441827e
] =

[Failing test for issue1877: pull --xml-output should not emit any verbosit=
y
lele@nautilus.homeip.net**20100620093136
 Ignore-this: f0704d4dd673fe589bff2427e8feca77
] =

[Slightly more aggresive and extendable issue1763 test.
Eric Kow <kowey@darcs.net>**20100618225104
 Ignore-this: d1fa4997e6313fa21a95ebcc6d529881
] =

[Bug fix: treat filenames in darcs-2 patches as raw bytes.
Eric Kow <kowey@darcs.net>**20100602110817
 Ignore-this: d283d32e56eb92ca2e7e9959d625eb48
 (instead of trying to decode from UTF-8)
] =

[Bug fix: inverse conflictors should also use raw bytes for filenames.
Eric Kow <kowey@darcs.net>**20100602112801
 Ignore-this: e66332fcf70600acea05b9c495a7afe5
] =

[resolve issue1389: Change predist pref to point people to use 'cabal sdist=
'
Reinier Lamers <tux_rocker@reinier.de>**20100615061429
 Ignore-this: ae016ce38e16674a0206df256efa4729
] =

[Tweak haddock markup.
Eric Kow <kowey@darcs.net>**20100617083948
 Ignore-this: 28cf2d270384ad2d3563e6feb45e9c77
] =

[ Remove duplicated entries after any modification is done to the cache
builes.adolfo@googlemail.com**20100616222018
 Ignore-this: 2d573fc02638d69bdc8be9327431d5ab
] =

[Resolve issue 1176: caches interfere with --remote-repo flag
builes.adolfo@googlemail.com**20100615144402
 Ignore-this: c56ca8e13033dc51561e9b0201645e09
] =

[Generalise mechanism for updating roundup.
Eric Kow <kowey@darcs.net>**20100615220910
 Ignore-this: 4aea9f807ecbb3d2c6c0b49027e6d453
 Unfortunately, this leads to slightly less human-friendly update text.
 Some special-casing or attention to phrasing could help.
] =

[Checking for any cache entry in test for issue1210
builes.adolfo@googlemail.com**20100614225931
 Ignore-this: 49849cd80eb57029d9ed70f0656a85ba
] =

[Make the tests for dont-prompt-deps use -i
Florent Becker <florent.becker@ens-lyon.org>**20100611163130
 Ignore-this: 3f24c1e9a24774842f95517ff22e6ad2
 The old tests tested 'darcs foo --match $matcher --all' instead of
 'darcs foo -match $matcher --dont-prompt' because of dry-run.
] =

[Drop global cache entries from _darcs/prefs/sources
builes.adolfo@googlemail.com**20100614221328
 Ignore-this: 621e9c529a1d32d46698289825a37294
] =

[Check conflictor consistency in "darcs check".
Petr Rockai <me@mornfall.net>**20100607193939
 Ignore-this: 29b8497ece4ee8ba0bcb472e71618eab
] =

[Resolve issue1857: Use and update pristine root pointer upon conversion.
Petr Rockai <me@mornfall.net>**20100607193701
 Ignore-this: b86c3880a29d1358e0cca58adff867b
] =

[Make it possible to optionally set roundup status on command line.
Eric Kow <kowey@darcs.net>**20100613163256
 Ignore-this: c40300ad328d0094efa8e76500782ac2
] =

[Resolve issue1874: recognise network tests on cabal test command line.
Eric Kow <kowey@darcs.net>**20100611102251
 Ignore-this: 59a455ef26b5df9a3bdd356e1e37854e
] =

[haddocks for SelectChanges
Florent Becker <florent.becker@ens-lyon.org>**20100610140023
 Ignore-this: c4203f746fc6278dc5290332e3625283
] =

[better message when skipping already decided patches
Florent Becker <florent.becker@ens-lyon.org>**20100531065630
 Ignore-this: 426675973555e75086781f0c54fbf925
] =

[Accept issue1871: darcs record . failure for changes in subdir.
Eric Kow <kowey@darcs.net>**20100609145047
 Ignore-this: dd942b980dd3006bfa5d176ec5cfdf99
] =

[Extend the issue1014 test to check that named patches are not duplicated.
Petr Rockai <me@mornfall.net>**20100607185041
 Ignore-this: 383ff17461076a798193b6c0c2427bba
] =

[Haddock merge2FL and fastRemoveFL in Patch.Depends.
Petr Rockai <me@mornfall.net>**20100607184849
 Ignore-this: cd6e79c4e404820d4f0ae94a53aed8c1
] =

[Limit index updates to relevant subtree in a few cases.
Petr Rockai <me@mornfall.net>**20100509102248
 Ignore-this: fea041133d039cecead73935f0cd6762
] =

[Fix a bunch of "unused" warnings.
Petr Rockai <me@mornfall.net>**20100607194111
 Ignore-this: 1fec82080eca9c3f10b690ee0ef81e34
] =

[Shorten issue1210 test name.
Eric Kow <kowey@darcs.net>**20100608090708
 Ignore-this: 57ff2a1cbb9795f80ae3d81e19717a9e
] =

[Add test for issue1210: global cache gets recorded in _darcs/prefs/sources
builes.adolfo@googlemail.com**20100608010902
 Ignore-this: bc02ada910927be93dd4a5cc9826d20d
] =

[Fix typo in the BSD version of date arithmetic (testsuite).
Petr Rockai <me@mornfall.net>**20100608062802
 Ignore-this: fdfb7aef46966a18edc2f7e93c0118f0
] =

[Let's try to work with BSD date as well.
Petr Rockai <me@mornfall.net>**20100608061631
 Ignore-this: 628e6f15e8f8d6801a3f1dd6c8605e17
] =

[Fix a race condition in the match-date test.
Petr Rockai <me@mornfall.net>**20100607223257
 Ignore-this: 4c6452bfdee6c03eb95abcd646add90f
] =

[Skip issue1763 test (non-ascii filenames) on win32.
Petr Rockai <me@mornfall.net>**20100607185116
 Ignore-this: f4d344f31111a9a1f3a5d3257d73eae
] =

[Cut unused NonPatch type synonym.
Eric Kow <kowey@darcs.net>**20100601123903
 Ignore-this: 2a649c14b8ae2cdcf83c80f49db3979b
] =

[Accept issue1726: Files with _darcs prefix are always boring
Daniel Dickison <danieldickison@gmail.com>**20100114065856
 Ignore-this: cbb1b05144d54e5f446be559516e02a8
] =

[Fix comment for encodeWhite/decodeWhite.
Eric Kow <kowey@darcs.net>**20100529133947
 Ignore-this: a8ac626327b539f50fada1817ebbe49d
] =

[Make install-deps more relaxed about "cabal update" failures.
Petr Rockai <me@mornfall.net>**20100607174335
 Ignore-this: 6e202c1e8f8fc5b0cda78bc56093e38c
] =

[Another install-deps fix: read -d, fails at last field instead of EOF.
Petr Rockai <me@mornfall.net>**20100607173901
 Ignore-this: 6a61fcf0279e9d03477dc24e56b0d47b
] =

[Canonize A. Builes, R. Dorcik, R. Plasil, S. Wehr and T. Refis.
Eric Kow <kowey@darcs.net>**20100607090251
 Ignore-this: afa0b7e5769b38e6450c740dd052e084
] =

[Resolve issue1210: global cache gets recorded in _darcs/prefs/sources
builes.adolfo@googlemail.com**20100606211915
 Ignore-this: 5e7d0c93f25b2b64b949e66fc0f17398
] =

[Resolve issue1610: mark the test as passing. Likely fixed by NewSet.
Petr Rockai <me@mornfall.net>**20100603123718
 Ignore-this: 9145934b0ca0f45033153a51071ae6f2
] =

[Resolve issue1337: mark the test as passing. Likely addressed by noslurps.
Petr Rockai <me@mornfall.net>**20100603123133
 Ignore-this: f65514d2b221bbaa771f13908dc5f02
] =

[clean fetch's options
Florent Becker <florent.becker@ens-lyon.org>**20100528090336
 Ignore-this: 8aa07b7c154d47cd8042f7c60d7224c1
] =

[Resolve issue1860: (Un)applying move patches may lead to incomplete pristi=
ne.
Petr Rockai <me@mornfall.net>**20100606142919
 Ignore-this: f81b28cc30fbd28b88a87bc33c0d1f06
 =

 Fixed in hashed-storage 0.5.2 -- directory renames in TreeIO have caused
 subsequent (disk) flush-es to be incomplete in some cases.
] =

[show patches the right way in unrecord --verbose
Florent Becker <florent.becker@ens-lyon.org>**20100531072225
 Ignore-this: 44ce88d38bfae7b5ef0d83fb5b3de5db
] =

[Accept issue1860: (Un)applying move patches may lead to incomplete pristin=
e.
Petr Rockai <me@mornfall.net>**20100606142858
 Ignore-this: 99a035085f393e8ab0931a9ee7655d7e
] =

[Resolve issue1817: --external-merge broken, by bumping h-s dependency to 0=
.5.1.
Petr Rockai <me@mornfall.net>**20100603205330
 Ignore-this: 65630f4ed7a4b7c6f61acd6a9b39b582
 =

 This h-s releases fixes a problem in index handling code where reading fil=
es
 from a Tree that was created from an index only worked in the same working
 directory in which the index had been opened. This was breaking
 externalResolution which called readBlob on index'd files (working) from a
 temporary directory.
] =

[Make the external-resolution.sh test a bit more thorough.
Petr Rockai <me@mornfall.net>**20100603205251
 Ignore-this: 191ff6615d8475b6bc6e3dd4125c825c
] =

[resolve issue1864: w should only skip one patch
Florent Becker <florent.becker@ens-lyon.org>**20100606152421
 Ignore-this: 110d2f0dd49de4bd45562d93b506852d
] =

[Resolve issue1861: Fix typo in --no-boring help.
Eric Kow <kowey@darcs.net>**20100606082412
 Ignore-this: 1170ad348daf1c51bda9db5b6885764b
] =

[Skip the case folding test on case-sensitive systems.
Petr Rockai <me@mornfall.net>**20100603123735
 Ignore-this: a95efe82ba079791b19029595363d681
] =

[Fix whitespace in Darcs.Repository.InternalTypes.
Eric Kow <kowey@darcs.net>**20100603145732
 Ignore-this: 8e8eefb4bc1752512187f64488a7933d
] =

[resolve issue1848: Patch.Choices.makeEverythingSooner is incorrect
Florent Becker <florent.becker@ens-lyon.org>**20100603141933
 Ignore-this: ef9ea4cb04d313c668b3854409e5f451
 This made selection of patches with --match buggy when choosing Last or
 FirstReversed patches. This affected primary patch selection in rollback,
 record --ask, and any other command with --reverse.
] =

[Resolve issue1503: prefer local caches to remote ones
builes.adolfo@googlemail.com**20100603053659
 Ignore-this: 8e7af0e4d04a8e58b819bbe93817d681
] =

[Accept issue1857: error reading _darcs/pristine.hashed on failed test.
Eric Kow <kowey@darcs.net>**20100531220011
 Ignore-this: 4f6d3d38d864fe4d54b3bfd9156cf09f
] =

[Accept issue1848: rollback -p should allow interactive patch selection.
Eric Kow <kowey@darcs.net>**20100602195144
 Ignore-this: 12dc6c3fe105132214868e6606ba252a
] =

[resolve issue1843:  interactive 'v' prints double entries  =

Florent Becker <florent.becker@ens-lyon.org>**20100527211945
 Ignore-this: bdcec9798ec4b536bb628dad0c337949
] =

[resolve issue1839: k broken in interactive selection
Florent Becker <florent.becker@ens-lyon.org>**20100527211710
 Ignore-this: 4f64f36ce0c6645537e16a99bd7f73b2
] =

[resolve issue1784: push and pull print remote address right away
Guillaume Hoffmann <guillaumh@gmail.com>**20100518154233
 Ignore-this: a79d70e5c08ad15e02d3402e9a50c8a6
] =

[Accept issue1825: darcs remove with no args leads to buggy pending.
Eric Kow <kowey@darcs.net>**20100505155919
 Ignore-this: bfbb70a3ed0d39970591ef6dbc805ffc
] =

[Resolve issue1763: use correct filename encoding in conflictors.
Petr Rockai <me@mornfall.net>**20100527121019
 Ignore-this: 62d98022e62edf926d601ba3074eaf0b
] =

[Bump version to 2.4.4.
Eric Kow <kowey@darcs.net>**20100515090809
 Ignore-this: aaf77575defdebf53d64ec4b1af6d2f1
] =

[News entries for Darcs 2.4.4.
Eric Kow <kowey@darcs.net>**20100515083529
 Ignore-this: 8f22a502764329c80c9d0bf24b4c7f96
] =

[Remove more not + redirections usage in testsuite (breaks win32).
Petr Rockai <me@mornfall.net>**20100511213008
 Ignore-this: 6f6ff7795fc1916934a91949ff9217f4
] =

[Do not redirect output to a file when using "not" to avoid trouble on win3=
2.
Petr Rockai <me@mornfall.net>**20100511211032
 Ignore-this: 8f28cf755ece79f92de5e7ea4707170d
] =

[Bump version to 2.4.3.
Eric Kow <kowey@darcs.net>**20100509132258
 Ignore-this: 73b74ac6fc5bd59f6ca4ca50949df761
] =

[News entry for Darcs 2.4.3.
Eric Kow <kowey@darcs.net>**20100509132204
 Ignore-this: 6302e30f87f8f4b451c91384d40957d5
] =

[Clarify 2.4.2 news entry.
Eric Kow <kowey@darcs.net>**20100509132154
 Ignore-this: cd7f7f01dfc3d0605e8db09a82c1305f
] =

[Update homepage for 2.4.4 release.
Eric Kow <kowey@darcs.net>**20100523095907
 Ignore-this: fe1e56e85cb49f67f0d3626f24472db4
 Note the darcs-2.4.4_1 tarball (the previous one had an wrong context file=
)
] =

[Remove announce.html.
Eric Kow <kowey@darcs.net>**20100509141132
 Ignore-this: 164e852877809382bf64fc390863cf8f
 I configured the web server to redirect this to
 http://wiki.darcs.net/Releases
] =

[News entries for darcs 2.4.2.
Eric Kow <kowey@darcs.net>**20100508083254
 Ignore-this: 4483bb27ad6ea5903f8501711fc253e6
] =

[Bump version to 2.4.2.
Eric Kow <kowey@darcs.net>**20100504161429
 Ignore-this: 61bb6973a1f562927e2263387f0f1576
] =

[accept issue1845 darcs wants file paths from root of working copy
Guillaume Hoffmann <guillaume.hoffmann@loria.fr>**20100513130803
 Ignore-this: cc12362ef959f686c4c8453430a111f0
] =

[Resolve issue1841: Apply binary mode to ssh process and patch file handles=
.
Jeremy Cowgar <jeremy@cowgar.com>**20100512194935
 Ignore-this: 8da8ddae9e95ba474c43b9d99430efd3
] =

[Use System.FilePath.Posix instead of System.FilePath.
Petr Rockai <me@mornfall.net>**20100511190138
 Ignore-this: d8979c3b3e166de6f278d2ab78e07446
] =

[Rename head_permutationsFL to simpleHeadPermutationsFL.
Eric Kow <kowey@darcs.net>**20100511183404
 Ignore-this: b058c7e7e221cb6117874c8ef894d1de
 There's already a headPermutationsFL.  Using underscore vs camels
 to distinguish between the two variants seems confusing.
] =

[Avoid --debug in issue381.sh which currently breaks on GHC 6.12/win32.
Petr Rockai <me@mornfall.net>**20100511185534
 Ignore-this: 9c7ec2fa83bd76412638503c74943cf0
] =

[Fix spurious backslashes in URIs on win32.
Petr Rockai <me@mornfall.net>**20100510161347
 Ignore-this: 5232a642bba8fa0250c3eb9e46310130
] =

[Camel case Darcs.Test.Patch.*.
Eric Kow <kowey@darcs.net>**20100510174209
 Ignore-this: aa19a98d3cecc042dc51e4abe34e3cf8
] =

[Camel case Darcs.Compat.
Eric Kow <kowey@darcs.net>**20100510172655
 Ignore-this: e9367b065de930d9cdfb5075b6cd391c
] =

[Camel case Darcs.Witnesses.Show.
Eric Kow <kowey@darcs.net>**20100510172328
 Ignore-this: dd13b914e3322a6ee22c1050c379a4ca
] =

[Camel case is_file function in Darcs.URL.
Eric Kow <kowey@darcs.net>**20100510172055
 Ignore-this: e4e57d24661bc2c2321e3bcdc383c8c9
] =

[Camel case miscellaneous remaining functions.
Eric Kow <kowey@darcs.net>**20100510172001
 Ignore-this: abc78ef814a4e6b0f59e8b2e855e8f3a
] =

[Camel case Darcs.Population and Darcs.PopulationData.
Eric Kow <kowey@darcs.net>**20100510171126
 Ignore-this: 8a8225b83e72143154657873df1d5a80
] =

[Camel case Darcs.Test.Email.
Eric Kow <kowey@darcs.net>**20100510170131
 Ignore-this: 40c08c15d0ea0d45b4d5beb66ce381e6
] =

[Camel case URL and HTTP modules.
Eric Kow <kowey@darcs.net>**20100510163608
 Ignore-this: 5b87c3b7a991ee7bad6e96da96f3851c
] =

[Camel case Darcs.Patch.*.
Eric Kow <kowey@darcs.net>**20100510162631
 Ignore-this: 5146088212f597f06819c8a1a49ca8f8
] =

[Camel case most of Darcs.Repository.*.
Eric Kow <kowey@darcs.net>**20100510155623
 Ignore-this: d2f801fc2471310117a2155ff2c963b3
] =

[Camel case Darcs.Patch.Bundle.
Eric Kow <kowey@darcs.net>**20100510155301
 Ignore-this: af0ccf224baf9e4e1a043cafcd905172
] =

[Camel case Darcs.Repository itself.
Eric Kow <kowey@darcs.net>**20100510154728
 Ignore-this: 98cb1f410c37496eea9c662555a2a712
] =

[Camel case Darcs.Repository.HashedRepo and DarcsRepo.
Eric Kow <kowey@darcs.net>**20100510154211
 Ignore-this: 74de9409afab5e754ba718e40ae2edc3
] =

[Camel case Darcs.Repository.LowLevel.
Eric Kow <kowey@darcs.net>**20100510131420
 Ignore-this: 33e6adcc1b2bfa373e8419f85b232e7b
 Note that this introduces a collision in Darcs.Repository.State.
 We use a qualified import to distinguish between the two uses
 (which is clearer anyway).
] =

[Fix "./Setup test trackdown-bisect" from sdist tarball.
Trent W. Buck <trentbuck@gmail.com>**20100511090852
 Ignore-this: 8ec870b10b4a360eeb944fdf2d48247b
] =

[Tell "runghc Setup sdist" about Darcs.Witnesses.WZipper.
Trent W. Buck <trentbuck@gmail.com>**20100511074155
 Ignore-this: 8c49499b284e9c7a5c40bacdd4fb42a2
] =

[Update homepage news for darcs 2.4.3 release.
Eric Kow <kowey@darcs.net>**20100509140254
 Ignore-this: 5330061d5d37e109acd3358f00eb2a52
] =

[Update website to link to 2.4.3 tarball.
Eric Kow <kowey@darcs.net>**20100509134408
 Ignore-this: 9caece120f08204f7c7255a42ea97882
] =

[The roundup tracker does not use a guest/guest login.
Eric Kow <kowey@darcs.net>**20100509134303
 Ignore-this: de143e05bb8b4f8679dfc6ffedde2f26
] =

[Fix a number of "unused" warnings in Darcs.Commands.*.
Petr Rockai <me@mornfall.net>**20100508101436
 Ignore-this: 4769284dc781ca9de8bfbfcc591467d5
] =

[Fix a number of "unused" warnings in Darcs.Repository*.
Petr Rockai <me@mornfall.net>**20100508094442
 Ignore-this: 6d7df44a056338ae4f90254d50bc7867
] =

[A new implementation of PatchSet and its operations.
Petr Rockai <me@mornfall.net>**20100508091915
 Ignore-this: be2eacd192f60854e85597a3b9096237
 =

 This patch introduces two major changes:
 - in hashed repositories, only the inventories that have actually been mod=
ified
   are recomputed and written out to disk... this makes the operations that
   change inventories [record, unrecord, pull, unpull, ...] go from O(n) to=
 O(1)
   in the common case
 - get_common_and_uncommon and related functionality has been reimplemented=
 and
   is now simpler and (hopefully) more robust...
 =

 Based on work done by David Roundy.
] =

[Give a more informative error when hunk apply fails.
Petr Rockai <me@mornfall.net>**20100508091232
 Ignore-this: 8406be543e7d845db315b736193471d8
] =

[work around cabal flag composition bug
Jason Dagit <dagit@codersbase.com>**20100508050721
 Ignore-this: 80b1e7d51119595e3c156a7a2cf5dc7b
 There is a bug with the way cabal combines flags of different nesting
 levels in the .cabal file.  See ticket 684 for details:
 http://hackage.haskell.org/trac/hackage/ticket/684
] =

[Camel case Darcs.Test.
Eric Kow <kowey@darcs.net>**20100507180825
 Ignore-this: 4e9f3176e8227fc74128897f32b82d8d
] =

[Camel case Darcs.Commands.ShowFiles.
Eric Kow <kowey@darcs.net>**20100507180307
 Ignore-this: f4251964ef5aa94244b9835f9ee0796c
] =

[Mark issue1837 test as passing.
Eric Kow <kowey@darcs.net>**20100507155657
 Ignore-this: d77b00be627a8b8e491daab843ceb1c3
] =

[Accept issue1837: inconsistent repo upon darcs get --partial.
Eric Kow <kowey@darcs.net>**20100507155147
 Ignore-this: 59d0261f0a214d510da449bcaf634b1a
] =

[Also use readWorking in setScriptsExecutable (minor refactor).
Petr Rockai <me@mornfall.net>**20100506152035
 Ignore-this: e5524ac22f39f39d81bba641f07872ec
] =

[Resolve issue1837: Add readWorking and use it in pristineFromWorking.
Petr Rockai <me@mornfall.net>**20100506151943
 Ignore-this: 6feec15528cc3ad225160889a50d2328
] =

[In replacePristine, cope also with Trees that have no hashes in them.
Petr Rockai <me@mornfall.net>**20100506151524
 Ignore-this: 2cb1062d562a1a87df9736add16eed31
] =

[Remove seemingly unused Darcs.CheckFileSystem.
Eric Kow <kowey@darcs.net>**20100507162621
 Ignore-this: 7423c7f660dfe4a4b85d52c1d8983be1
] =

[Remove unorm.h dependency on Windows, since it's no longer used.
Petr Rockai <me@mornfall.net>**20100506123814
 Ignore-this: ae96180d22daefdeec3a9d0f722435ac
] =

[Remove the icuuc dependency now that it is no longer used.
Petr Rockai <me@mornfall.net>**20100506105033
 Ignore-this: c6d082028cc9380433c068d3ea6c218d
] =

[Fix compilation on GHC 6.12 on win32 (needs unix-compat).
Petr Rockai <me@mornfall.net>**20100506140338
 Ignore-this: 2d297a41747af7ec4ec1b2e1a10f42f7
] =

[Normalise path separators in the query_manifest test.
Petr Rockai <me@mornfall.net>**20100506140516
 Ignore-this: 792bcdf6b6da4c083cb87adfad534803
] =

[Let's try to fix install-deps.sh for the case of multiple packages missing=
.
Petr Rockai <me@mornfall.net>**20100506110439
 Ignore-this: c233187248082eed2ca0d2d7d7c9fac0
] =

[Bump hashed-storage dependency to 0.5.
Petr Rockai <me@mornfall.net>**20100506103257
 Ignore-this: 496ec6b74337c2153938181f64583843
] =

[Purge Slurpy usage in Commands.Rollback (use announceFiles from whatsnew).
Petr Rockai <me@mornfall.net>**20100505195235
 Ignore-this: 178d1572610063e4d3260fcaee4d474e
] =

[Use stock setScriptsExecutable from Darcs.Repository in Commands.Convert.
Petr Rockai <me@mornfall.net>**20100505190059
 Ignore-this: b321549196821da21f222502ab638223
] =

[Clean up unused bits in Repository.HashedIO.
Petr Rockai <me@mornfall.net>**20100428215446
 Ignore-this: a94c9d179cb15e543a679f2d65ba2b48
] =

[Make clean_hashdir work on repository-local dirs even without caches.
Petr Rockai <me@mornfall.net>**20100428215337
 Ignore-this: 7d449fe6c9279294dba3265a7b56af85
] =

[Resolve conflict in Commands.Record.
Petr Rockai <me@mornfall.net>**20100428210510
 Ignore-this: d4105641a8df8549b7cb32169eeb9400
] =

[Resolve conflicts in Commands.Add.
Petr Rockai <me@mornfall.net>**20100428210505
 Ignore-this: e25033d19b80016411d7e2ef98ec5f45
] =

[Resolve conflicts in Match.
Petr Rockai <me@mornfall.net>**20100428210441
 Ignore-this: 1b537b58f9327563431898fa7cc3b646
] =

[Resolve conflict in Commands.Move.
Petr Rockai <me@mornfall.net>**20100428205342
 Ignore-this: 6425c0bd82140c43db204ceee643261e
] =

[Resolve conflicts in Repository.Internal.
Petr Rockai <me@mornfall.net>**20100428205329
 Ignore-this: 261aab3d0a6aa1d62fb4b3fae650d783
] =

[Resolve conflicts in Commands.ShowFiles.
Petr Rockai <me@mornfall.net>**20100428205231
 Ignore-this: 96172ea14b0d139cb75c6cc4a024d5fa
] =

[Filter out _darcs in setScriptsExecutable.
Petr Rockai <me@mornfall.net>**20100428203629
 Ignore-this: 2e8b318c3c581124602b4bf423e42f60
] =

[Make the automatic pristine conversion a bit nicer.
Petr Rockai <me@mornfall.net>**20100428203446
 Ignore-this: 46b841bd6d18f4ff6e3f9532e79ba7b
] =

[Bump the mmap dependency to match that of hashed-storage HEAD.
Petr Rockai <me@mornfall.net>**20100321104930
 Ignore-this: 20382e45f2335f4e82abe7d714258f4f
] =

[Remove a couple of unused Cache parameters.
Petr Rockai <me@mornfall.net>**20100319150405
 Ignore-this: b17452ed01eba0be7a878fd6751d351b
] =

[Automatically drop size prefixes from all of pristine when needed.
Petr Rockai <me@mornfall.net>**20100319143731
 Ignore-this: 28295cf7b18e96990c2333cd852547e9
] =

[Purge unused fileExists from Commands.Record.
Petr Rockai <me@mornfall.net>**20100225063513
 Ignore-this: 3abc668b8ac30efa33a4eeb1e6e5c598
] =

[Avoid use of SlurpDirectory in Commands.ShowFiles.
Petr Rockai <me@mornfall.net>**20100225063037
 Ignore-this: ae3d732d9991499761c3f59e2e176d93
] =

[Remove SlurpDirectory.
Petr Rockai <me@mornfall.net>**20100212103641
 Ignore-this: 67152870c67b473196bd70d3be1e0d4b
] =

[Replace slurp_recorded with readRecorded in make_new_pending.
Petr Rockai <me@mornfall.net>**20100212103322
 Ignore-this: e93e16ab7f034e75d08856fe4f7552ab
] =

[Use a more canonic way to create empty hashed pristine.
Petr Rockai <me@mornfall.net>**20100212103258
 Ignore-this: 427ce854cba763660d246d10e2506c9e
] =

[Reimplement applyHashed in terms of hashedTreeIO (Storage.Hashed.Monad).
Petr Rockai <me@mornfall.net>**20100212102842
 Ignore-this: faf483fb34735e50609cc7d8a9298959
] =

[Use a more canonic way to create empty hashed pristine in optimize (--upgr=
ade).
Petr Rockai <me@mornfall.net>**20100212101844
 Ignore-this: 12c51e119cb5d83854a3d0481ede54e0
] =

[Port Commands.Move from Slurpy to Tree.
Petr Rockai <me@mornfall.net>**20100211093153
 Ignore-this: fc5fa93cee36b31633b2f87835e7e872
] =

[Re-implement setScriptsExecutable using Trees instead of Slurpies.
Petr Rockai <me@mornfall.net>**20100211001435
 Ignore-this: 48a8573d147f621056420bde318879de
] =

[Re-implement optimize --relink using Trees instead of Slurpies.
Petr Rockai <me@mornfall.net>**20100211001353
 Ignore-this: f280f1051dac421d1d311d8989175993
] =

[Generalize announceFiles used by whatsnew and use it in record as well.
Petr Rockai <me@mornfall.net>**20100210235000
 Ignore-this: 31c4d0d30f953908c875b08279a42970
] =

[Re-work Commands.Add (simplify, use the new treeHas* functions).
Petr Rockai <me@mornfall.net>**20100210234820
 Ignore-this: e1e3d1ce7630f32603f6aba73eff3993
] =

[Re-implement the Slurp-based file/dir existence-check functions in terms o=
f Trees.
Petr Rockai <me@mornfall.net>**20100210234711
 Ignore-this: dcfb751285177905b9d78c4877a63622
] =

[Replace SlurpDirectory usage in Commands.Add with Tree-based code.
Petr Rockai <me@mornfall.net>**20100210122601
 Ignore-this: df915a18e5522654c7b9665c10dc9d0
] =

[Remove implementation of --store-in-memory, simplifying matcher code.
Petr Rockai <me@mornfall.net>**20100208224704
 Ignore-this: 5d602bb79894737720cd47dbe5b60d84
] =

[Camel case some leftovers in Darcs.Commands.{Add,Move}.
Eric Kow <kowey@darcs.net>**20100505195409
 Ignore-this: 7b95aa51503cdc6b641a787f87f9c26e
] =

[Camel case Darcs.Commands.Pull again (fetch).
Eric Kow <kowey@darcs.net>**20100505195043
 Ignore-this: fc8a7d0945bfa0ecd27681e37a16e672
] =

[Catch Darcs.Hopefully up with Darcs.Patch.Info camel casing.
Eric Kow <kowey@darcs.net>**20100505194820
 Ignore-this: bfc050a7e1631034a15349d7ea88a36d
] =

[Resolve conflicts: fetch, obliterate -o vs SelectChanges refactor.
Eric Kow <kowey@darcs.net>**20100505194514
 Ignore-this: b53b8db8199f43fa2fe7d13ba0933afc
] =

[Add a fetch command
Florent Becker <florent.becker@ens-lyon.org>**20100422141133
 Ignore-this: bd75c58d19947457c9a051520f5ca6fc
] =

[Add -o option to obliterate, to keep a backup of the patch
Florent Becker <florent.becker@ens-lyon.org>**20100216151714
 Ignore-this: bf70f73add0f2d9e8f53b2eb2ec6b489
 With that patch, you can mkdir _darcs/trash and add "obliterate
 output-auto-name _darcs/trash" to your defaults file. This gives
 you a rudimentary trash for obliterated patches.
 =

] =

[fix conflicts in Send
Florent Becker <florent.becker@ens-lyon.org>**20100322165159
 Ignore-this: 6f099aa8ef71037c52e237b1087931f6
] =

[extract a few functions from Send
Florent Becker <florent.becker@ens-lyon.org>**20100216145932
 Ignore-this: 8edacd18269c87bdec328ab5b7e377f6
] =

[Extend issue1232: darcs convert fails if missing _darcs/prefs/prefs
Dino Morelli <dino@ui3.info>**20100505141500
 Ignore-this: 60e5b1235b053c238df94bc40f71d62e
 =

 In the earlier fix for this issue, did not consider the possibility that
 the prefs file may not be present in the source repo.
] =

[Extend issue1232: test to account for missing _darcs/prefs/prefs case
Dino Morelli <dino@ui3.info>**20100505140111
 Ignore-this: c41b20f918c7e4eb218a1fccd3bc973e
 =

 Also now sourcing tests/lib.
] =

[Camel case Darcs.Patch.Info.
Eric Kow <kowey@darcs.net>**20100505144350
 Ignore-this: 706f5e66c7a53eecb4bdd1380bd591cf
] =

[Remove redundant Darcs.Commands.Optimize.isTag.
Eric Kow <kowey@darcs.net>**20100505134955
 Ignore-this: 6671c2867873f2bede02659a76542fe
] =

[Fix typos in matcher documentation.
Eric Kow <kowey@darcs.net>**20100505131954
 Ignore-this: e8f2f9dfb1f0466a6523fedb1bb9ed97
] =

[Documentation for `hunk' and `comment' matchers
Matthias Kilian <kili@outback.escape.de>**20100502124415
 Ignore-this: 986a553c3881127c6424eb4aeaec5611
 While here, fix the usage example for the hunk matcher (add missing
 quotes).
] =

[resolve issue1769: add support for --match 'comment ...'
Matthias Kilian <kili@outback.escape.de>**20100502124125
 Ignore-this: 810d2ee013b907447ae0052a25214c8e
 This uses `comment' rather than `description' as the latter term is
 already used by darcs send. (Pointed out by kowey@darcs.net)
] =

[Camel case unit tester.
Eric Kow <kowey@darcs.net>**20100505132733
 Ignore-this: 40af9e2dfcbd8be6957af0caaa4c5c6a
] =

[Fix unit.lhs: s/metadataStringTest/metadataDecodingTest/.
Eric Kow <kowey@darcs.net>**20100505132401
 Ignore-this: d748411f0fb72f839c969949f829f54
] =

[Resolve issue1760: Fix working directory handling in Commands.Convert.
Petr Rockai <me@mornfall.net>**20100502105706
 Ignore-this: cf8e9c87fce4e5a0b6f26a3a265a087d
] =

[remove spurious todo in Choices.hs
Florent Becker <florent.becker@ens-lyon.org>**20100502171636
 Ignore-this: 1815f3982ff69221a4a46b5b7f7848d
] =

[make the new Patch.Choices compile in ghc6.10
Florent Becker <florent.becker@ens-lyon.org>**20100422132742
 Ignore-this: 208fc70bd0cfca7cea49f4117355ca75
] =

[Fix representation of patches in darcs revert's interactive selection
Florent Becker <florent.becker@ens-lyon.org>**20100320135243
 Ignore-this: 3435cdaafe0a2eb5782fa75b77100d5f
] =

[Clean up the new version of Patch.Choices
Florent Becker <florent.becker@ens-lyon.org>**20100320073539
 Ignore-this: b498351a527232f0978f724fc63ee8a3
] =

[fix patch counting in interactive selection
Florent Becker <florent.becker@ens-lyon.org>**20100319151142
 Ignore-this: fac7198c4933ffefdfaa5e6ce7a12ba2
] =

[fix conflicts in SelectChanges
Florent Becker <florent.becker@ens-lyon.org>**20100319144652
 Ignore-this: f3cc27bc838fd432055427445d5444bf
] =

[Change representation of PatchChoices
Florent Becker <florent.becker@ens-lyon.org>**20100317141011
 Ignore-this: 9fdccbea3b3e052daad0e17ff08ce1b4
] =

[resolve conflicts in SelectChanges
Florent Becker <florent.becker@ens-lyon.org>**20100319143738
 Ignore-this: a1ce22d5d27a2a99552997c421c88feb
] =

[monadify interactive patch selection
Florent Becker <florent.becker@ens-lyon.org>**20100218164520
 Ignore-this: 2a8bfdc0d259717e745a1b733bd606fd
] =

[Resolve conflicts in Record.lhs
Florent Becker <florent.becker@ens-lyon.org>**20100319143005
 Ignore-this: d8094be102371ada2f28bfd5da60ae52
] =

[add the --reverse option to all patch-selecting commands
Florent Becker <florent.becker@ens-lyon.org>**20100218105500
 Ignore-this: c7639248f7752928e574ee045297b595
] =

[resolve conflicts in AmendRecord.lhs
Florent Becker <florent.becker@ens-lyon.org>**20100319135913
 Ignore-this: 531da0efe536286f45e8d3c140691efb
] =

[Simplify SelectChanges' interface and non-interactive part
Florent Becker <florent.becker@ens-lyon.org>**20100217150522
 Ignore-this: 91ecef5e7b722114b3f8bafc15bdd5ce
] =

[add a witnessed zipper type
Florent Becker <florent.becker@ens-lyon.org>**20100218164516
 Ignore-this: 9390d87c7a6d8f7abd8aeca135bd7606
] =

[Some haddocks for Patch.Choices
Florent Becker <florent.becker@ens-lyon.org>**20091120212410
 Ignore-this: e9896beae85fa327ef880ecda23f528c
] =

[Rename metadataStringTest to metadataDecodingTest
Reinier Lamers <tux_rocker@reinier.de>**20100502121728
 Ignore-this: 1bfcd34afe59d9d0490fc2f72929173c
] =

[Add some haddock in Darcs.Patch.Info
Reinier Lamers <tux_rocker@reinier.de>**20100502121520
 Ignore-this: 1c8180fa1907050bae8f6a1b38d2bdfb
] =

[Document behavior of text decoding functions in case of malformed input
Reinier Lamers <tux_rocker@reinier.de>**20100502121356
 Ignore-this: 6b3967b7771e4434fa173cfd4dcc526b
] =

[resolve issue64: store metadata as UTF-8, autodetect UTF-8, and don't norm=
alize to NFC
Reinier Lamers <tux_rocker@reinier.de>**20100502121206
 Ignore-this: ae22511c7679f078412698f866d69255
] =

[Resolve issue1814: Include contrib/darcs-errors.hlint in release tarball.
Petr Rockai <me@mornfall.net>**20100430130319
 Ignore-this: a4fbf9156ac5f7a8d1ef90d36580434c
] =

[Resolve issue1824: avoid PACKAGE_VERSION under Windows.
Eric Kow <kowey@darcs.net>**20100503115630
 Ignore-this: 289a827c98ba3b286404e4af6d8ada4c
 There's some quoting issue passing the PACKAGE_VERSION string via the CPP.
 This seems to affect Windows, so we'll just skip around the issue until
 (presumably) Cabal/cabal-install are fixed.
] =

[Avoid PACKAGE_VERSION CPP macro in HTTP (see issue1824 note below).
Eric Kow <kowey@darcs.net>**20100427164119
 Ignore-this: 958347db110818044e2992309b3bbab8
 This only solves the issue for -f-curl.
] =

[Haddock for Darcs.Repository.Cache.unionRemoteCaches.
Dmitry Kurochkin <dmitry.kurochkin@gmail.com>**20100425120559
 Ignore-this: c6086e68f4611df4569ae7af506a8afa
] =

[Camel case SHA1.
Eric Kow <kowey@darcs.net>**20100414124724
 Ignore-this: ab6626f2b5a24c015d3900c985686ed2
] =

[Fix typo (dacas -> darcs).
Petr Rockai <me@mornfall.net>**20100427143706
 Ignore-this: 6806605cb90b6274ae421040e4f12f69
] =

[URL: keep notify MVars in a single place.
Dmitry Kurochkin <dmitry.kurochkin@gmail.com>**20100418223752
 Ignore-this: d9d96011cd94325084b599539c3fba0e
 This will prevent deadlocks when we wait for one MVar and notification is =
done
 through another. Such situations can happen when one URL is requested seve=
ral
 times during a short period of time.
] =

[Fix hscurl.c when URL is downloaded during the first call to curl_multi_pe=
rform.
Dmitry Kurochkin <dmitry.kurochkin@gmail.com>**20100415224739
 Ignore-this: c62e88cc36664062ceca1db2462ab8ea
 Turns out that the first call to curl_multi_perform() can fetch the URL or
 result in error. I can easily reproduce this using HTTP server on localhos=
t.
 This means that situation when running_handles is zero is valid, so remove=
 the
 error and handle it correctly.
] =

[hscurl.c: remove #ifdef HAVE_CURL check.
Dmitry Kurochkin <dmitry.kurochkin@gmail.com>**20100418222800
 Ignore-this: 1c4a805cfc2d0b5473e57fb688cebd35
 hscurl.c is not compiled when curl support is disabled.
] =

[Simplify libcurl pipelining configuration.
Dmitry Kurochkin <dmitry.kurochkin@gmail.com>**20100418221013
 Ignore-this: 212e59463cdc264e12323d6d90e7d991
 - remove curl-pipelining cabal flag
 - decide if pipelining is supported in hscurl.c
 - use pipelining by default if it is supported
 - remove --http-pipelining option
] =

[Pass -DCURL_PIPELINING to C compiler when HTTP pipelining is enabled.
Dmitry Kurochkin <dmitry.kurochkin@gmail.com>**20100416112105
 Ignore-this: bd233e8ee530f453d6e3ae862b85a24
 Otherwise libcurl pipelining option is never really enabled. But URL
 module believes that it is. This leads to libcurl openning tens of
 parallel connections to the server.
] =

[Mention darcs blog and planet on homepage.
Eric Kow <kowey@darcs.net>**20100426184558
 Ignore-this: 879590cd726045c8864aca11ea80cf8b
] =

[style tweak: reformatted an import
Dino Morelli <dino@ui3.info>**20100417161929
 Ignore-this: abcd595754adcec3d38576980c66c87a
] =

[Resolve issue1232: darcs convert forgets _darcs/prefs/prefs
Dino Morelli <dino@ui3.info>**20100417160638
 Ignore-this: 3973731c4c3c5297546570ebe3662f06
 =

 Added code to copy the _darcs/prefs/prefs file into the newly created
 darcs2 repository during a convert. A dumb copy is possibly not the best
 solution, but is better than nothing.
] =

[Accept issue1232: darcs convert forgets _darcs/prefs/prefs
Dino Morelli <dino@ui3.info>**20100417154530
 Ignore-this: 4f3a7348b2f783e0e73e01cc4c83389c
] =

[Camel case Darcs.Patch.OldDate.
Eric Kow <kowey@darcs.net>**20100423160958
 Ignore-this: 7f08471d66258473945228b33ff4a168
] =

[Camel case Darcs.URL.
Eric Kow <kowey@darcs.net>**20100423160336
 Ignore-this: f8be6c3c1ec56131f3088ed0dd82b558
] =

[Camel case Darcs.Resolution.
Eric Kow <kowey@darcs.net>**20100423155627
 Ignore-this: 7f73b06a68ecbbc712e7ed72a89e3ff
] =

[Camel case Darcs.CommandsAux.
Eric Kow <kowey@darcs.net>**20100423155556
 Ignore-this: 91836eb5599b7e462fc00cf4a0b2fbb0
] =

[Camel case Darcs.ArgumentDefaults.
Eric Kow <kowey@darcs.net>**20100423155525
 Ignore-this: f2154950404b8f8bc22c72248ba5843e
] =

[Camel case ByteStringUtils.
Eric Kow <kowey@darcs.net>**20100423155002
 Ignore-this: 67e5e0a24ac01faf933053df4ff9cf72
] =

[Skip tests/issue1645-ignore-symlinks on win32.
Petr Rockai <me@mornfall.net>**20100425111201
 Ignore-this: 433ab1ef0d54fb5a82a3c297a884bb14
] =

[Bump h-s dependency to 0.4.12, working around an lstat bug on windows.
Petr Rockai <me@mornfall.net>**20100425102948
 Ignore-this: ccf39a951241962334b25587f326391d
] =

[export the right list of patches when not pulling anything
Florent Becker <florent.becker@ens-lyon.org>**20100422113403
 Ignore-this: a141a12b717584a67119a650b4d9dabe
] =

[Resolve conflicts in Commands.Pull
Florent Becker <florent.becker@ens-lyon.org>**20100319133133
 Ignore-this: 923a8606ee8687faaec5fa1a2ab5ef9
] =

[Refactor Darcs.Commands.Pull
Florent Becker <florent.becker@ens-lyon.org>**20100215151311
 Ignore-this: 32519bee41027660a1218b722cc8f33d
] =

[Resolve conflicts with dependency bump patches in 2.4.1.
Eric Kow <kowey@darcs.net>**20100423144957
 Ignore-this: 5192510a5e62340a591ca6b610897c2b
] =

[Resolve issue1645: bump hashed-storage to 0.4.11; don't follow symlinks.
Eric Kow <kowey@darcs.net>**20100411150004
 Ignore-this: dc680d7f37252c59035b19cbd0f27927
] =

[resolve issue1756: bump hashed-storage dependency to 0.4.10
Reinier Lamers <tux_rocker@reinier.de>**20100325082732
 Ignore-this: c59e8582416191a8d55b72ae511f70b3
] =

[Fix issue1645 case fold test
Reinier Lamers <tux_rocker@reinier.de>**20100412161809
 Ignore-this: e0b21f376bc7bf9c4ddb7b96bb09db44
] =

[Split case-folding tests for issue1645 out so we can skip them as needed. =

Eric Kow <kowey@darcs.net>**20100411150013
 Ignore-this: 5ebab6147495d19c0887a30313333fad
] =

[Mark issue1645 test as succeeding
Reinier Lamers <tux_rocker@reinier.de>**20100411191726
 Ignore-this: f317ad5678f6da229fbf8640f213552d
] =

[Bump version number to 2.4.1
Reinier Lamers <tux_rocker@reinier.de>**20100331192010
 Ignore-this: 393714af607bcbb61403c98cc950bead
] =

[Update NEWS for 2.4 and 2.4.1
Reinier Lamers <tux_rocker@reinier.de>**20100331191826
 Ignore-this: 8c6d76e9df8a4543c268f69faaa22b46
] =

[Camel case Preproc.
Eric Kow <kowey@darcs.net>**20100421124050
 Ignore-this: bf63b53528208f5d5d45fb3a17bcf061
] =

[Camel case Darcs.Email.
Eric Kow <kowey@darcs.net>**20100414125018
 Ignore-this: d82c5eb4340a4fd2550fe2ada2f9ab67
] =

[Camel case Darcs.Global.
Eric Kow <kowey@darcs.net>**20100414124936
 Ignore-this: 327a3c3ffa9e1db09d0e0d1c1b9e5bd6
] =

[Camel case Darcs.RemoteApply.
Eric Kow <kowey@darcs.net>**20100414124423
 Ignore-this: e177b7ecf53bf4da045a3fb44cac95a3
] =

[Camel case Darcs.Lock.
Eric Kow <kowey@darcs.net>**20100414124339
 Ignore-this: 7b89fe935434729409a65fedfe39e5d6
] =

[make witnesses compile in Repository.hs
Florent Becker <florent.becker@ens-lyon.org>**20100422123213
 Ignore-this: a4306f940e52c01f855cf75921a0418
] =

[Darcs.Repository: use pipelining when copying patches.
Dmitry Kurochkin <dmitry.kurochkin@gmail.com>**20100418150302
 Ignore-this: c714c981e39b139088c143e62502808d
 Speculate on patches in fetch_patches_if_necessary. Improves darcs get tim=
e
 for the http://darcs.net repository from 37:24 to 21:25 for me.
] =

[URL: add maxPipelineLength function, rename maxPipeLength to maxPipelineLe=
ngthRef.
Dmitry Kurochkin <dmitry.kurochkin@gmail.com>**20100418140129
 Ignore-this: 8c2ae11d37b7bb471ca23cf0e76785b2
] =

[Resolve issue1159: smart caches union.
Dmitry Kurochkin <dmitry.kurochkin@gmail.com>**20100416235644
 Ignore-this: 608859997eb69ac9263d29333f8b4dba
 Try to do better than just blindly copying remote cache entries:
 =

 * If remote repository is accessed through network, do not copy any cache
   entries from it. Taking local entries does not make sense and using netw=
ork
   entries can lead to darcs hang when it tries to get to unaccessible host=
.
 =

 * If remote repositoty is local, copy all network cache entries. For local
   cache entries if the cache directory exists and is writable it is added =
as
   writable cache, if it exists but is not writable it is added as read-onl=
y
   cache.
 =

 This approach should save us from bogus cache entries. One case it does no=
t
 work very well is when you fetch from partial repository over network.
 Hopefully this is not a common case.
] =

[Create manual directory if it doesn't exist
Matthias Kilian <kili@outback.escape.de>**20100413155518
 Ignore-this: d04fb2f93c3ca2f2063de65d37cb845c
] =

[Camel case IsoDate.
Eric Kow <kowey@darcs.net>**20100413090324
 Ignore-this: 28711c4f06efbca91d32e58cccbd4aef
] =

[Camel case Printer and Darcs.ColorPrinter.
Eric Kow <kowey@darcs.net>**20100413090019
 Ignore-this: ac34462e93c124a525a701613888ebcf
] =

[Camel case Exec, Darcs.Utils and Darcs.External.
Eric Kow <kowey@darcs.net>**20100413084749
 Ignore-this: af802a1f850a6b4a9b11748ae98373fa
] =

[Also update release date on homepage
Reinier Lamers <tux_rocker@reinier.de>**20100412203602
 Ignore-this: aebc0ebf001f605c6c5976b513181c42
] =

[Update website for 2.4.1 release
Reinier Lamers <tux_rocker@reinier.de>**20100412203338
 Ignore-this: 2836e036539c6e909b1a6a730bb4da4f
] =

[Implemented all test cases from the discussion of bug 1645
Dmitry Astapov <dastapov@gmail.com>**20100406055346
 Ignore-this: 315cde3de56fabf831ba0eccd9b05dcd
] =

[Fix darcs bug tip (missing space).
Eric Kow <kowey@darcs.net>**20100408095322
 Ignore-this: b4efd917ad2640b42d66dc8289dc9935
] =

[Disable DARCS_PATCHES_XML posthook test on Windows.
Eric Kow <kowey@darcs.net>**20100406090852
 Ignore-this: 94599a3c536d6918b676a37c1c515c09
] =

[Make issue1739 test skip instead of fail on non-UTF-8 locales
Reinier Lamers <tux_rocker@reinier.de>**20100405182339
 Ignore-this: 5dac9d7dc54f00ce0ea7ebd05fbadc8
] =

[Accept issue1363: mark-conflicts inconsistency with duplicate patches.
Eric Kow <kowey@darcs.net>**20100405162547
 Ignore-this: c0e670a8b86320a2f49d44e40700ee05
] =

[Accept issue1737: confusing darcs move error message.
Eric Kow <kowey@darcs.net>**20100404232819
 Ignore-this: 6b4724073f797920079fb8f18186c4e1
] =

[drop unnecessary GHC extensions from test helper
Ganesh Sittampalam <ganesh@earth.li>**20100330060645
 Ignore-this: 8f680413627f62d2a64367b09566d4e9
] =

[speed up test by compiling helper once
Ganesh Sittampalam <ganesh@earth.li>**20100330060335
 Ignore-this: 9a99e3313b15ae22fd66c7d41990e783
] =

[add type witnesses to trackdown --bisect
Ganesh Sittampalam <ganesh@earth.li>**20100330055445
 Ignore-this: 6a7461b8379b0fa2435b8c520d2bd0f0
] =

[fix warning
Ganesh Sittampalam <ganesh@earth.li>**20100330055412
 Ignore-this: c63adb3883ec2755ee42c4865227c823
] =

[resolve-issue1208: trackdown --bisect (PatchTree).
dixiecko@gmail.com**20100329221033
 Ignore-this: 2cf3fae3067034ba33b03e597c31be3f
] =

[Test for issue183.
Eric Kow <kowey@darcs.net>**20100402201819
 Ignore-this: 749fd958582f0066da64ffef2ba654af
 This fails with Darcs 2.2 but passes with my "Resolve issue183" patch.
] =

[Fix bug in issue1645 test.
Eric Kow <kowey@darcs.net>**20100401131100
 Ignore-this: dfcf454712d2a5bbcdd68c663f4c5218
] =

[Avoid a direct multibyte string in issue1739 test that confuses ShellHarne=
ss.
Petr Rockai <me@mornfall.net>**20100330234535
 Ignore-this: bce2d83738d201cd25dcc644a9f45fe2
] =

[Refactor makeRemovePatch: use foldM and split in two
Reinier Lamers <tux_rocker@reinier.de>**20100321101733
 Ignore-this: 2be7c48e7b74377519f3d6dcb33bdeeb
] =

[Rename issue1765 test to reflect that it succeeds
Reinier Lamers <tux_rocker@reinier.de>**20100320172808
 Ignore-this: 1f72ba012bb3cb79a6e05e75f5befdc6
] =

[resolve issue1765: refuse to remove non-tracked directories recursively
Reinier Lamers <tux_rocker@reinier.de>**20100320165913
 Ignore-this: ee68c106b9320035e66563387c82d1de
 =

 The modifyTree function from hashed-storage makes any directories on the p=
ath
 to modify exist. When removing a non-tracked file, this made darcs assume =
that
 its parent directory was tracked, even when it wasn't.
 =

 This patch makes darcs do the modifyTree only when the remove of a file
 actually succeeded, so that when a remove of a non-tracked file fails, dar=
cs
 won't have a data structure that reflects a world where this removal succe=
eded.
 =

] =

[Tidy up issue1727 test.
Eric Kow <kowey@darcs.net>**20100329152507
 Ignore-this: cd01b4e40793c07bcd8fc4b0ba3fc570
] =

[Accept issue1727: darcs move . target fails.
Sean Erle Johnson <merehap@gmail.com>**20100329152220
 Ignore-this: a03afb31163d1cd9e4bf39775c2231a9
] =

[resolve issue1427 accept gzipped patch bundles in darcs apply
Guillaume Hoffmann <guillaumh@gmail.com>**20100321105908
 Ignore-this: eb582991fcd855ba6836919559c4e305
] =

[accept issue1427 accept gzipped patch bundles in darcs apply
Guillaume Hoffmann <guillaumh@gmail.com>**20100321105638
 Ignore-this: 4607b02530f8de85e9e9165f993b1080
] =

[Extend issue1645 with additional pathologies.
Trent W. Buck <trentbuck@gmail.com>**20100327061617
 Ignore-this: f0ade119d4126af22b88cc21f23215ec
] =

[Resolve issue1756: new h-s handles file removals correctly in Index.
Petr Rockai <me@mornfall.net>**20100324212453
 Ignore-this: bbedaa58cc6630492efed346332ee21d
] =

[Make commuteFL symmetrical with commuteRL
Florent Becker <florent.becker@ens-lyon.org>**20100321150747
 Ignore-this: 89401ec18692de220c8c0717ab390923
] =

[useless string concatenation plus useless $.
refis.thomas@gmail.com**20100320231905
 Ignore-this: 5ae00cbb8df010b049448b9680fc759f
] =

[use isPrefixOf instead of take x y =3D=3D "string" in some places
Guillaume Hoffmann <guillaumh@gmail.com>**20100321144255
 Ignore-this: c5c2dc8a3862c46b6f6c2d206eedff8f
] =

[accept issue1763: pull on non-ascii filenames
Reinier Lamers <tux_rocker@reinier.de>**20100321144249
 Ignore-this: b09a1beef9dbb6a6bd46d5b03cb04712
] =

[resolve issue1739: make ColorPrinter handle characters > 255
Reinier Lamers <tux_rocker@reinier.de>**20100221155614
 Ignore-this: ff06ddd7ef801f92cbf66cfd9ba4e467
] =

[remove the hardcoded string "_darcs" in some places and replace it with th=
e global darcsdir
David Markvica <david@blueshellturtle.com>**20100110201836
 Ignore-this: 37f9eb21f1e6af46283a1ee985843b2f
] =

[export stdout in RepoPath
Florent Becker <florent.becker@ens-lyon.org>**20100215153909
 Ignore-this: 7e5aaea98f7931aae8176d6ede188961
] =

[demonadify useAbsoluteOrStd
Florent Becker <florent.becker@ens-lyon.org>**20100215152808
 Ignore-this: 3bf358bcbefa08b3e9121fad91014b8
] =

[Put presentParticiple into the English module
Florent Becker <florent.becker@ens-lyon.org>**20100204140434
 Ignore-this: 5edb03b4ae71697774715244342315fc
] =

[add --keep-date option to amend-record
Ganesh Sittampalam <ganesh@earth.li>**20100320233508
 Ignore-this: 98c0e9dea29abe79f63bf15d82d3dc38
] =

[Resolve conflict between tar dependency and hashed-storage bump
Reinier Lamers <tux_rocker@reinier.de>**20100321123909
 Ignore-this: 58bf27fb7550445f7ad3c74456786f96
] =

[Bump hashed-storage dependency to 0.4.8
Salvatore Insalaco <kirby81@gmail.com>**20100321103955
 Ignore-this: 3e54bef5ade88f3c402c8e9eecbd7ca
] =

[Accept issue1765: recursive remove on root
Luca Molteni <volothamp@gmail.com>**20100320143438
 Ignore-this: 90de508f42c0d4b5b4379fefb6a92995
] =

[Resolve issue643 darcs send -o outputs remote repo email address
Guillaume Hoffmann <guillaumh@gmail.com>**20100320162730
 Ignore-this: ba9b2380b2e327f45a2ae038fad2d3e3
] =

[useless string concatenation
Guillaume Hoffmann <guillaumh@gmail.com>**20100320135054
 Ignore-this: 78e61463ba38c7fbc023b6eccbb33571
] =

[Add --match option to apply
Florent Becker <florent.becker@ens-lyon.org>**20100320150651
 Ignore-this: f4fb470e62d58da25c74a42a9f7e96e0
] =

[use library function 'not' for checking failure
Ganesh Sittampalam <ganesh@earth.li>**20100320150215
 Ignore-this: be9fc5ba5f1811d94f3a0694c1037453
] =

[Resolve issue1473: annotate command accepts "." and treats "" as invalid i=
nput
mail@stefanwehr.de**20100320141718
 Ignore-this: 5faea0580f9cf17ee59964a509f90613
] =

[Only use stderr in install-deps, avoiding stderr/stdout interleaving issue=
s.
Petr Rockai <me@mornfall.net>**20100320143212
 Ignore-this: 7fe9820f10015867f17d70f39ef5e201
] =

[Pass the install-deps options down to second cabal install call as well.
Petr Rockai <me@mornfall.net>**20100320134009
 Ignore-this: 5061ea1965ed6856ee0cf455c27e2ae0
] =

[We also need tar to build witnesses.
Petr Rockai <me@mornfall.net>**20100320133306
 Ignore-this: cb1dc2f700b84d5564927fb95245c39f
] =

[make dist.sh test check the archive created by dist
Guillaume Hoffmann <guillaumh@gmail.com>**20100320095521
 Ignore-this: 5261970d6966520b0d2bb70acc98982d
] =

[resolve issue1456 by using Tar and GZip haskell modules for dist
Guillaume Hoffmann <guillaumh@gmail.com>**20100319163315
 Ignore-this: 88ac3e7b6b545dc284a829ca1c2f6082
] =

[Removed -cpp flag as suggested by HLint
Stefan Wehr <mail@stefanwehr.de>**20100319142241
 Ignore-this: 2ffd2a7a3f52bc2117b0033079177173
] =

[New bugtracker reporting page.
Eric Kow <kowey@darcs.net>**20100318215106
 Ignore-this: 436df165c5621e18029dcaf5838faa59
] =

[replace if-statement with guard in elegant_merge
Jason Dagit <dagit@codersbase.com>**20100318030051
 Ignore-this: 8e359f579041af4f5ea2a6deca40341c
] =

[Resolve issue1750: uncover help text for darcs show pristine.
Eric Kow <kowey@darcs.net>**20100221125933
 Ignore-this: 46c8575ff5889d6092f9e5a221275732
 f r { foo =3D bar } means           f (r { foo =3D bar })
 whereas what we really wanted was (f r) { foo =3D bar }
] =

[Correct online help text for aliases of subcommands.
Eric Kow <kowey@darcs.net>**20100221125653
 Ignore-this: e33fe432bc0ef53205103cabdcd33a61
] =

[Augment the .boring file to cover the generated manual bits.
Petr Rockai <me@mornfall.net>**20100120201503
 Ignore-this: e01e6731b72711d565e47c0c8cd4222d
] =

[disable unused do binding warnings for now
Ganesh Sittampalam <ganesh@earth.li>**20100317190703
 Ignore-this: f95d7ccbde494a04eeed2391800e14b7
 The alternative to this would be to go through the code and actually fix
 the warnings, and it's not obvious this is desirable.
] =

[add PatternGuards extension to witnesses build
Ganesh Sittampalam <ganesh@earth.li>**20100317190650
 Ignore-this: 4ec25389175f525264b359d08a01939b
] =

[add cabal flag to control build of darcs library
Ganesh Sittampalam <ganesh@earth.li>**20100317190648
 Ignore-this: d2ab724f18b7b52ec3f90b3638856cf7
] =

[Update tests/README.test_maintainers.txt to cabalized build system
Reinier Lamers <tux_rocker@reinier.de>**20100315171511
 Ignore-this: 3b869e68133c1c79dcbe44aa811ec40
] =

[Include tests/README.test_maintainers.txt in distribution tarballs
Reinier Lamers <tux_rocker@reinier.de>**20100314130520
 Ignore-this: 5b326ecc806c89dc64b297ab93bbc665
] =

[Fix update_roundup.pl for the case where only one patch is applied.
Eric Kow <kowey@darcs.net>**20100315131029
 Ignore-this: 94d433b30629456470cd337f1404132a
 =

 We need to avoid the XML::Simple feature that uses simple scalar values fo=
r
 tags that only have one elment in them.  For more information, perldoc
 XML::Simple::FAQ.
] =

[resolve issue1767: send CRC warnings to stderr
Ganesh Sittampalam <ganesh@earth.li>**20100314224948
 Ignore-this: b0555759c3fa55fc9689f9a957d9eb1
] =

[Fix my posthook test (sorry!).
Eric Kow <kowey@darcs.net>**20100314204956
 Ignore-this: 1644ca3a512ac4b020d992ab1a61608c
] =

[Test for DARCS_PATCHES_XML.
Eric Kow <kowey@darcs.net>**20100314195355
 Ignore-this: b48913e1dc123d75e688ab9d0b949180
] =

[Also add PatchInfo test module to darcs.cabal
Reinier Lamers <tux_rocker@reinier.de>**20100313225611
 Ignore-this: b5cc937839f36206c5a7c11fde15305c
] =

[Test release tarballs more thoroughly in release.sh
Reinier Lamers <tux_rocker@reinier.de>**20100313225454
 Ignore-this: 423fe1d4b4a8c97758c937fae9df3c7a
] =

[Add missing unit test modules to darcs.cabal
Reinier Lamers <tux_rocker@reinier.de>**20100313221428
 Ignore-this: 22eb7e0530a1b81cd8da21c35974a4e1
] =

[resolve conflict between witnesses and Origin import
Ganesh Sittampalam <ganesh@earth.li>**20100306185527
 Ignore-this: 74eb31398aa3576b430d3e81d9943b3d
] =

[resolve conflict between witness addition and issue1749 fix
Ganesh Sittampalam <ganesh@earth.li>**20100306185242
 Ignore-this: c33d05a6410a452c005ecac1362d594f
] =

[add witnesses to Darcs.Commands.Replace
Ganesh Sittampalam <ganesh@earth.li>**20100210210633
 Ignore-this: 96da24a06dde4b3eba357230cf054c7a
] =

[fix witnesses in Darcs.Commands.Remove using gaps
Ganesh Sittampalam <ganesh@earth.li>**20100210210003
 Ignore-this: 352fa85ba57dd1d1a907a42ced4324f7
] =

[add witnesses to Darcs.Commands.Check
Ganesh Sittampalam <ganesh@earth.li>**20100210191307
 Ignore-this: 4d197c1f543741abaa78d9dac26573b7
] =

[add witnesses to Darcs.Repository.Repair
Ganesh Sittampalam <ganesh@earth.li>**20100210190716
 Ignore-this: 23432ed7f437a4d7fc964ec4e6f8db99
] =

[add witnesses to treeDiff
Ganesh Sittampalam <ganesh@earth.li>**20100210184308
 Ignore-this: 2d73685b18d3132b6d27eb47a9239ca1
] =

[everything now compiles with witnesses
Ganesh Sittampalam <ganesh@earth.li>**20100211184608
 Ignore-this: 78389082d81bcf4d56b6ca17c83a9344
 Note that because of some bits of conditional compilation, this doesn't
 mean we can turn witnesses on for the real build yet.
 =

] =

[add witnesses to Darcs.Commands.Rollback
Ganesh Sittampalam <ganesh@earth.li>**20100211184435
 Ignore-this: 160f72201755ce5b42ac23ade377fccd
] =

[add witnesses to Darcs.Commands.Convert
Ganesh Sittampalam <ganesh@earth.li>**20100211181613
 Ignore-this: c248f20a43b06b92b45c3c01ddbd93f9
] =

[add witnesses to Darcs.Commands.MarkConflicts
Ganesh Sittampalam <ganesh@earth.li>**20100211113510
 Ignore-this: 6ab56b2f81bf05be63b1ea68f90604f9
] =

[add witnesses to Darcs.Commands.Revert
Ganesh Sittampalam <ganesh@earth.li>**20100211113418
 Ignore-this: 8c04a7f6c4f43e21b43235e2cff49901
] =

[add witnesses to Darcs.Commands.AmendRecord
Ganesh Sittampalam <ganesh@earth.li>**20100211113324
 Ignore-this: 8e4866806ec8fd82ee57e8385fd7bc12
] =

[use tentative repo in askAboutDepends
Ganesh Sittampalam <ganesh@earth.li>**20100211113157
 Ignore-this: d1937b4194d0a5e32fd543ebb7139457
] =

[add witnesses to Darcs.Commands.Optimize
Ganesh Sittampalam <ganesh@earth.li>**20100211111941
 Ignore-this: c89c41e7e3a33186df876c8139b065e4
] =

[add witnesses to Darcs.Commands.Put
Ganesh Sittampalam <ganesh@earth.li>**20100211111204
 Ignore-this: 2fa39ac0cd590d9fd6051a201605b7c6
] =

[return new repo from applyToWorking
Ganesh Sittampalam <ganesh@earth.li>**20100211110410
 Ignore-this: b5aea13a912440abfe4e645f8a9c80ef
] =

[add witnesses to Darcs.Commands.Get
Ganesh Sittampalam <ganesh@earth.li>**20100210205723
 Ignore-this: 485a129fd292695b5b8e4f5cf714be70
] =

[add witnesses to Darcs.Commands.Add
Ganesh Sittampalam <ganesh@earth.li>**20100210203754
 Ignore-this: dcb548d2e96b50c3cccede82e84758da
] =

[add witnesses to Darcs.Commands.Record
Ganesh Sittampalam <ganesh@earth.li>**20100210193209
 Ignore-this: ef01c3841210514485e13621ca5f5a12
] =

[add witnessed toFL operation
Ganesh Sittampalam <ganesh@earth.li>**20100210193104
 Ignore-this: f1585c7f0d8e15edb216b9750e591ddb
] =

[add witnesses to Darcs.Commands.Move
Ganesh Sittampalam <ganesh@earth.li>**20100210191544
 Ignore-this: c55d6910e4d79a2a8bfe47f1cdc150ad
] =

[add witnessed variant of PatchInfo
Ganesh Sittampalam <ganesh@earth.li>**20100210185926
 Ignore-this: b9f54295d9eca8687a4a785b5d8e9028
] =

[reduce conditionalisation on witnesses in Darcs.Patch.Commute
Ganesh Sittampalam <ganesh@earth.li>**20100126201933
 Ignore-this: 6ba0e070aff1bbac7a0f4d508aced1cb
] =

[add TypeOperators to witnesses build
Ganesh Sittampalam <ganesh@earth.li>**20091221190333
 Ignore-this: 22808f3dad964cb930d44436080c93e2
] =

[add docs to Gap and related types
Ganesh Sittampalam <ganesh@earth.li>**20100212180627
 Ignore-this: 9013feebb49e489e1d1c7c5770d191da
] =

[add concept of gaps
Ganesh Sittampalam <ganesh@earth.li>**20091211010754
 Ignore-this: afe3115fd2333f00cb5a4c8a1f7ec281
] =

[return new repository state from tentativelyAdd etc
Ganesh Sittampalam <ganesh@earth.li>**20091202191833
 Ignore-this: 72a9c476023fa0c22cd0aa21d1f6ef1e
] =

[adding patches should affect the tentative state
Ganesh Sittampalam <ganesh@earth.li>**20091127174439
 Ignore-this: a98e2488424993191bd790f76ee819c0
] =

[make tentativelyRemove return the new repo state
Ganesh Sittampalam <ganesh@earth.li>**20091127174338
 Ignore-this: 683cba083ab428a231d8b2c2a144980c
] =

[Resolve issue1753: restrict mmap to version used by hashed-storage.
Eric Kow <kowey@darcs.net>**20100301163950
 Ignore-this: a53ca223c957f80ff5b021fc6c2026d8
 Looks like we'll have to be careful about synchronising the dependencies.
] =

[Remove intermediary files from "cabal sdist" tarball.
Trent W. Buck <trentbuck@gmail.com>**20100219003943
 Ignore-this: ddb9caa7bf9025c8e8b0ea8897e82844
 AFAICT these files are generated during "make html pdf", and are thus
 unnecessary in the source tarball.  Removing them makes "cabal sdist"
 work in clean checkout.
] =

[Update the install-deps script to work with Cabal 1.8.
Petr Rockai <me@mornfall.net>**20100302221215
 Ignore-this: 4d5f29b28f09727d3686bc9883c88878
] =

[fix issue458.sh failing on systems with xattrs
Jens Petersen <petersen@redhat.com>**20100305052023
 Ignore-this: 8dd7c366bf87f3f9106974e66cdccbe6
 =

 Systems with selinux or other extended fs attributes give output
 with trailing-dot like "-rw-------." instead of "-rw-------".
 The change just filters off any trailing "." with sed.
] =

[Resolve issue1755: fix apparent hard line break in homepage.
Eric Kow <kowey@darcs.net>**20100301152459
 Ignore-this: 673fd7b5e9b2c023a7940464feb7d979
 =

 I'm not entirely clear on why this should work, as the document
 is supposed to be XHTML.  Thanks to Wagner Ferenc for pointing
 out the solution!
] =

[Add a darcs get link to the homepage.
Eric Kow <kowey@darcs.net>**20100301134519
 Ignore-this: 3f3f789429f86dcbb9487e5651286443
] =

[update link to stable source
Ganesh Sittampalam <ganesh@earth.li>**20100227224104
 Ignore-this: 4ae61bd0c5fae4f056e9bf2e546effcc
] =

[resolve conflict in index.html
Ganesh Sittampalam <ganesh@earth.li>**20100227222851
 Ignore-this: e899f6fbadc1f21724c459ce406ab042
] =

[Add 2.4 release announcement to web site
Reinier Lamers <tux_rocker@reinier.de>**20100227115055
 Ignore-this: 38945035d233abb0565c16785e67fa9f
] =

[TAG 2.4
Reinier Lamers <tux_rocker@reinier.de>**20100226180900
 Ignore-this: 36ce0456c214345f55a7bc5fc142e985
] =

[Bump version number for 2.4 release
Reinier Lamers <tux_rocker@reinier.de>**20100226180835
 Ignore-this: 14c4b29514f630cd481526c848b67dec
] =

[Restore import of Origin needed for witness builds.
Eric Kow <kowey@darcs.net>**20100224203351
 Ignore-this: a41dbc86bd32a67df437223badc6e213
] =

[fix unused imports warnings
Benedikt Schmidt <beschmi@gmail.com>**20100214083818
 Ignore-this: f3c4c975434d038e6a6b7aa505c9b916
] =

[TAG 2.3.99.2
Reinier Lamers <tux_rocker@reinier.de>**20100218180015
 Ignore-this: b0f18efa7fef5783a6bc43604e39ab3c
] =

[Bump version number for darcs 2.4 rc2
Reinier Lamers <tux_rocker@reinier.de>**20100217174410
 Ignore-this: 9cfefc951b06be056c67bd7ba708c45c
] =

[resolve issue1731: bump the hashed-storage dependency once more
Reinier Lamers <tux_rocker@reinier.de>**20100217073217
 Ignore-this: 138c469beabd2794ccc4cffddc0d1512
] =

[TAG 2.3.99.1
Reinier Lamers <tux_rocker@reinier.de>**20100131140210
 Ignore-this: 3286e77a4d0227a1265f6e8356b813e4
] =

[Bump verson for 2.4rc1
Reinier Lamers <tux_rocker@reinier.de>**20100131140129
 Ignore-this: b4b458d17a54105efb8382453da37339
] =

[TAG 2.3.98.3
Reinier Lamers <tux_rocker@reinier.de>**20100126101458
 Ignore-this: eb49d49537d842e4556b177adb720c19
] =

[Bump version number for darcs 2.4 beta 3
Reinier Lamers <tux_rocker@reinier.de>**20100126101444
 Ignore-this: 7d54bed6197e5f6f33cba1c284deba66
] =

[TAG 2.3.98.2
Reinier Lamers <tux_rocker@reinier.de>**20100117211225
 Ignore-this: 6b00150eff9b4cbf81db6e2dabd336ad
] =

[Bump version number for darcs 2.4 beta 2
Reinier Lamers <tux_rocker@reinier.de>**20100117210712
 Ignore-this: 77433e80bd8f29c261ac344684a02310
] =

[TAG 2.3.98.1
Reinier Lamers <tux_rocker@reinier.de>**20100103150819
 Ignore-this: def816d83bf49dc3bc16c7473323385f
] =

[Bump version for 2.4 beta 1
Reinier Lamers <tux_rocker@reinier.de>**20100103150736
 Ignore-this: b6ec028ca2c4722cece9a46b6872c329
] =

[Purge unused bits of checkpoint reading.
Petr Rockai <me@mornfall.net>**20100212101946
 Ignore-this: f13352b4e4c2c19a5b598001966b6891
] =

[Add a missing Functor constraint on ReadableDirectory TreeMonad instance.
Petr Rockai <me@mornfall.net>**20100210235039
 Ignore-this: 951c03c12a89d89b4c67a987b876663c
] =

[Replace Slurpy usage in Commands.Diff.
Petr Rockai <me@mornfall.net>**20100208182027
 Ignore-this: 5f21f441a96d0848edc015972426a29d
] =

[Remove unused force_replace_slurpy.
Petr Rockai <me@mornfall.net>**20091116080225
 Ignore-this: 96647125058765f7e59f1e645f553f8c
] =

[Accept issue1740: darcs is confused if you move a tracked dir.
Eric Kow <kowey@darcs.net>**20100208150632
 Ignore-this: 261c70603212f3dfa7d8824f6beb6aa1
] =

[Rename and adjust issue 1749 tests now that it succeeds
Reinier Lamers <tux_rocker@reinier.de>**20100221113933
 Ignore-this: f6cdd7665dc6f18ee26f1b85ccf58f70
] =

[resolve issue1749: refuse to remove nonempty directories in makeRemovePatc=
h
Reinier Lamers <tux_rocker@reinier.de>**20100221113357
 Ignore-this: ad57e75a8f336ca97a981e16933a74ea
] =

[accept issue1749 - darcs remove <dir> can make broken patches
Ganesh Sittampalam <ganesh@earth.li>**20100220005547
 Ignore-this: a4e39aabef93199397485d753fe80992
] =

[Resolve issue1741: fix --list-options when option has multiple names.
Eric Kow <kowey@darcs.net>**20100217231135
 Ignore-this: 11157398045f56e762a21a40af26289c
] =

[Add a special thank-you to some of our bigger donors.
Eric Kow <kowey@darcs.net>**20100215142944
 Ignore-this: 3b548b13803c4ac4835b4735f910b792
] =

[Retire list of buildbot friends on thank-you page.
Eric Kow <kowey@darcs.net>**20100215142054
 Ignore-this: 5ba4310672fd8caa574223a9de8657a8
 I think we have to occasionally retire bits of the thank-you page to
 accommodate more recent entries.
] =

[CSS support for testimonials.
Eric Kow <kowey@darcs.net>**20100211120557
 Ignore-this: a9f169253bf95b16a96d649ea0fba7a2
] =

[News: darcs 2010 fundraising complete - we did it!
Eric Kow <kowey@darcs.net>**20100215081937
 Ignore-this: c4c5aee9aca2536a8de88d37daf54f4e
] =

[Point out upcoming Darcs 2.4 release on homepage news.
Eric Kow <kowey@darcs.net>**20100214204739
 Ignore-this: 589fd5649c11f00a81efd28e3baa6d0b
] =

[Add witnesses to Commands.Changes
Florent Becker <florent.becker@ens-lyon.org>**20100208150003
 Ignore-this: 227a56c5e4194a180081e678241a931c
] =

[Allow PatchSets not to start at the origin of the repo
Florent Becker <florent.becker@ens-lyon.org>**20100131215519
 Ignore-this: 604b85a56a69aec994d81d7e20a1ea8d
] =

[Remove useless case in Patch.Bundle
Florent Becker <florent.becker@ens-lyon.org>**20100131162539
 Ignore-this: ace697c626b94e109ecd1dedff2e6058
] =

[add seals in Changes to prepare for witnesses
Florent Becker <florent.becker@ens-lyon.org>**20100208144050
 Ignore-this: 2a798d89a7a1d560eed8710bfd466aba
] =

[Give Darcs.SelectChanges.text_view a sane type
Florent Becker <florent.becker@ens-lyon.org>**20100129095822
 Ignore-this: a47f33f6a7f265ef5b6819b6776218f9
] =

[Rename filterFL to filterFLFL, replace it with a version using Sealed2
Florent Becker <florent.becker@ens-lyon.org>**20100127131924
 Ignore-this: 262689c3125ab67f2e9e334a10d2c750
] =

[Camel case Darcs.RunCommand.
Eric Kow <kowey@darcs.net>**20100209131811
 Ignore-this: 289c8c9f2a4185489669e04ed401621c
] =

[Simplify sourcing of lib in EXAMPLE.sh.
Eric Kow <kowey@darcs.net>**20100208150505
 Ignore-this: 68ae4d80537abdd6cde0ac142f9ebaba
 The old way made sense when we had regression tests in different directori=
es.
 Now it just makes things cumbersome.
] =

[resolve issue 1719
Florent Becker <florent.becker@ens-lyon.org>**20100105150215
 Ignore-this: b90e43b1d3120b28261c7a5ff5056dc3
] =

[Warn for extra patches before selection in apply
Florent Becker <florent.becker@ens-lyon.org>**20100105143046
 Ignore-this: 70e488bade5ef86970a97d158f007bec
] =

[In check, compare index path list against working, not pristine.
Petr Rockai <me@mornfall.net>**20100203102717
 Ignore-this: 4f6fe81c86677964eb15088e4be090f8
] =

[Remove default $20 donation as this confuses people.
Eric Kow <kowey@darcs.net>**20100203120706
 Ignore-this: 129846c12c38ffce2918abad83cffd3b
] =

[resolve issue1250: check for newlines in setpref values
Florent Becker <florent.becker@ens-lyon.org>**20100105141018
 Ignore-this: ea1194357318edb8953e0387bfe5841d
] =

[Camel case Darcs.Patch.ReadMonads.
Eric Kow <kowey@darcs.net>**20100122123736
 Ignore-this: 2e462a282d79c13f8bc53f8e9e7f6b71
] =

[haddock ReadMonads
Jason Dagit <dagit@codersbase.com>**20100113163357
 Ignore-this: e664cf636d093ba71b60e766f99726e4
] =

[Remove (unused) lazy parser monad
Jason Dagit <dagit@codersbase.com>**20100113162918
 Ignore-this: c68d14ba2ad873d1edda71e9445bfcd7
] =

[Further refine the split UI text.
Eric Kow <kowey@darcs.net>**20100121233025
 Ignore-this: 1f6bbb81caf90eec6fd169d851db5e81
] =

[Simpler and more intuitive help text for hunk editor.
Eric Kow <kowey@darcs.net>**20100120215101
 Ignore-this: 8295fa18746221a9ec389c98f95af5c7
 Note that we lead the user to only edit the second chunk of text;
 but power users can still edit the first chunk if they like.
 (Thanks to Petr Ro=C4=8Dkai for suggestions on the text!)
] =

[Improve online help for hunk-splitting.
Eric Kow <kowey@darcs.net>**20091229014506
 Ignore-this: bf738600cf92d2466e339a63ca6c79f2
] =

[Name the separators in the hunk splitting interface.
Eric Kow <kowey@darcs.net>**20091229012613
 Ignore-this: b985d1fef1331e4eafa8730faf4b58f6
] =

[Require Cabal 1.8, fix the build-deps dump in --exact-version.
Petr Rockai <me@mornfall.net>**20100120215158
 Ignore-this: 42f643a0c36c6718580656f2dc4db6d
] =

[Do more in makefile `clean' target.
Dave Love <fx@gnu.org>**20100109114916
 Ignore-this: 82598bec9cb2ed442a2d031f7fbcae8
] =

[switch to extensible exceptions
Ganesh Sittampalam <ganesh@earth.li>**20091216013022
 Ignore-this: 14aecf51a3363031a4a6effbd6fec1bc
] =

[Tidy up donations page a little bit.
Eric Kow <kowey@darcs.net>**20100119192754
 Ignore-this: 2b4b15d6a18f79126ae0b61d8b128ce8
] =

[Encourage more use of Google Checkout (no fees) for donations.
Eric Kow <kowey@darcs.net>**20100119192523
 Ignore-this: b2b678ea4111206ff2e7611a88cee0d6
] =

[resolve issue1731: bump hashed-storage dependency to 0.4.5
Reinier Lamers <tux_rocker@reinier.de>**20100117205223
 Ignore-this: c6e300b3c56d85b425306530b4d6c7be
] =

[Better characterisation of Eric's time.
Eric Kow <kowey@darcs.net>**20100118093217
 Ignore-this: d933c93683620b8a19e3becdbddd2b02
] =

[Include the exact package versions darcs was compiled with in --exact-vers=
ion.
Petr Rockai <me@mornfall.net>**20100112205841
 Ignore-this: ba32c0022e565cfa40ebe2bbc98ec1fa
] =

[Fix typo in release script
Reinier Lamers <tux_rocker@reinier.de>**20100117211219
 Ignore-this: 51b23e8cb72cc73d912c24a61a3fe7d6
] =

[We should call "make website" before creating release tarballs.
Petr Rockai <me@mornfall.net>**20100112203130
 Ignore-this: d5950a2fa4917fa251220a3186cd35c2
] =

[Make "make website" work with clean doc/ as well.
Petr Rockai <me@mornfall.net>**20100112203048
 Ignore-this: 5fd15f0b92f9b7c506b0659d15b79204
] =

[Fix our version mechanism to make non-clean rebuilds pick up right version=
.
Petr Rockai <me@mornfall.net>**20100112203326
 Ignore-this: d58d3132dc75b6bfee515a85919ce7a6
 =

 Since Cabal relies on ghc --make, changes in -D flags are not noticed in
 dependency analysis and things do not get rebuild, which translates into s=
tale
 version numbers in produced darcs binaries (only --exact-version was corre=
ct in
 the old system). We now tack the version information into a generated modu=
le
 instead (header file changes are not noticed by ghc --make either). This
 involves an ugly hack, since autogenerated modules cannot be listed in
 other-modules, since this breaks sdist while at the same time, libraries h=
ave
 to have all their modules listed to work. And the version information is p=
art
 of darcslib. The workaround involves tricking the sdist implementation int=
o not
 seeing the other-modules clause in the cabal file. This seems to work.
] =

[Acknowledge NLTG group within Brighton for Eric's 20% time.
Eric Kow <kowey@darcs.net>**20100115183133
 Ignore-this: 80e39dfb524254b65788e0cdbd7917c5
] =

[Replace University of Brighton logo with crisper version.
Eric Kow <kowey@darcs.net>**20100115181902
 Ignore-this: b29ba13b857ad21aacc0ee2c18af0c41
] =

[Link to donations page from front page.
Eric Kow <kowey@darcs.net>**20100114172216
 Ignore-this: b6f114f446d6277cff11d4cb12a5c9cf
] =

[Resolve issue1677: require hashed-storage 0.4.4.
Petr Rockai <me@mornfall.net>**20100112144831
 Ignore-this: 92a9def06cccee05dc1cbaa63b6ef6fa
 =

 This version of hashed-storage produces index with correct hashes for empt=
y
 directories (the previous versions would use zeroes as the hash instead of=
 the
 hash of empty string there, leading to hash mismatches in the index).
] =

[Make release.sh handle beta releases correctly
Reinier Lamers <tux_rocker@reinier.de>**20100106175534
 Ignore-this: 4557cfafedfe39b180fbe65263f691cf
] =

[Resolve issue1720:  Fix cabal haddock problem.
Dave Love <fx@gnu.org>**20100106162322
 Ignore-this: 1521b3a742711ac3ee979efc765f6b61
] =

[Resolve issue121: add --ask-deps support to amend-record
Ganesh Sittampalam <ganesh@earth.li>**20091228223636
 Ignore-this: 8dc5e5728eb91e96db5fcc56c1a2d8f1
] =

[list recently added modules in .cabal file
Ganesh Sittampalam <ganesh@earth.li>**20100101231726
 Ignore-this: 6fa276c886c9e46beddee8dbf14c0b53
 All modules must be listed in the library section for darcslib to actually
 work, but we don't have any tests of that so a few were forgotten.
 =

] =

[remove utf-8 message-spam
Florent Becker <florent.becker@ens-lyon.org>**20091229113701
 Ignore-this: 4991d2f7ccb928c6a3f579f18ae81115
] =

[fill out witnesses.hs
Ganesh Sittampalam <ganesh@earth.li>**20091214143741
 Ignore-this: 85a50958100ee291fb6670e857a71cdd
 This just adds all modules to the list imported by witnesses.hs either
 directly or indirectly, with some imports commented out since the modules
 don't work with witnesses yet.
 =

 The idea is to make it easier to see what hasn't had witnesses added yet.
 =

] =

[Also import (<>)
Joachim Breitner <mail@joachim-breitner.de>**20091226202445
 Ignore-this: 5893bb451135f4eacc506c273f9a7520
] =

[Resolve issue1362: Mention repo name in mail send body
Joachim Breitner <mail@joachim-breitner.de>**20091224113444
 Ignore-this: 3e5e0bbc5415b1b3d7c72ba3e8e077c8
] =

[move witnesses code into its own namespace
Ganesh Sittampalam <ganesh@earth.li>**20091224142204
 Ignore-this: 9da1b928857a322b34c77da3005f91a7
] =

[simplify code
Ganesh Sittampalam <ganesh@earth.li>**20091208184343
 Ignore-this: b0cc1c919a3e629c09e968d09fa2d0e5
] =

[Change get_patches_beyond_tag so the return type matches the actual data
Ganesh Sittampalam <ganesh@earth.li>**20091214130619
 Ignore-this: 88508e6e3dfb97aeb5a02d9809b54294
 The outer RL was always a singleton.
] =

[update comment
Ganesh Sittampalam <ganesh@earth.li>**20091211001622
 Ignore-this: e27966b5e426452aacdbb4b907d9b6a3
] =

[drop #ifdef
Ganesh Sittampalam <ganesh@earth.li>**20091211002558
 Ignore-this: 8a2c4d284cc3a449201967ff25991a43
] =

[drop a bunch of old C helper code
Ganesh Sittampalam <ganesh@earth.li>**20091124190145
 Ignore-this: 635c00686df59473840a65b2d76f5883
] =

[fix conflict between commutex -> commute rename and utf8-metadata
Florent Becker <florent.becker@ens-lyon.org>**20091218134217
 Ignore-this: 36e29bec81129244975dbfd820790cc0
] =

[Kill unused import warning in Darcs.Utils
Reinier Lamers <tux_rocker@reinier.de>**20091122174023
 Ignore-this: a467c43dd666b5a8a2add7e7beab760
] =

[Make darcs depend on a haskeline that doesn't choke on malformed UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20091122145038
 Ignore-this: abc185f8d67f8c666acbdf78ba4660a1
] =

[Fix another conflict between UTF-8 and main branch
Reinier Lamers <tux_rocker@reinier.de>**20091122144924
 Ignore-this: 49c1b440c55ad797a9da67415f6921d3
] =

[Autodetect UTF-8 encoded metadata
Reinier Lamers <tux_rocker@reinier.de>**20091115155304
 Ignore-this: 6e1d6048fcf08a044076e0b20ad5e682
 =

 It adapts the unit tests accordingly.
 =

] =

[Resolve conflicts with import warnings and with the addition of a newline =
to the author file
Reinier Lamers <tux_rocker@reinier.de>**20091109214809
 Ignore-this: 2287539c9ec129cfb99105e180cc3b78
] =

[Add tests for function of UTF-8 marker line and for NFC normalization
Reinier Lamers <tux_rocker@reinier.de>**20091101165936
 Ignore-this: e3411834cfc81d53a821104dac8a20a7
] =

[Stop handling all command line arguments as Unicode text
Reinier Lamers <tux_rocker@reinier.de>**20091101144836
 Ignore-this: 36378aff05acba9cb1da5cb98b9b2793
] =

[Add C wrappers for ICU functions to work around changing symbol names
Reinier Lamers <tux_rocker@reinier.de>**20091031214649
 Ignore-this: 533d863a04caa0a3a7c7268400a83606
] =

[Resolve conflict about the handling of the author pref file
Reinier Lamers <tux_rocker@reinier.de>**20091031212525
 Ignore-this: 6d9d1b81780af984bb0517388941e771
] =

[Resolve conflict with darcs-hs merge
Reinier Lamers <tux_rocker@reinier.de>**20091010212534
 Ignore-this: a868ea1795626ae72b0ff756c448c09f
] =

[Normalize Unicode of the patch metadata for comparison.
Reinier Lamers <tux_rocker@reinier.de>**20091007181812
 Ignore-this: a4b0be23898a1f9cbb3feb7d309aed63
 =

 This also includes two other changes: the change from the utf8-string
 package to the text package for encoding matters, and the change from a si=
ngle
 'Ignore-this' line to two separate ones for the hash and the UTF-8 marker.
 =

] =

[Test that patches with non-latin1 metadata can be safely moved between rep=
os
Reinier Lamers <tux_rocker@reinier.de>**20091004113213
 Ignore-this: 83acc078930dc42ec6d5225836ebcaef
] =

[Move locale conversion out of IO monad
Reinier Lamers <tux_rocker@reinier.de>**20091004112511
 Ignore-this: 831e4d0993e52ad6be1c0cc9d1a022c3
 =

 This is motivated by the circumstance that GHC 6.12 will offer locale
 conversion with a pure type.
 =

] =

[Test that darcs tag stores metadata in UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20090927175836
 Ignore-this: 4339aae7f53b40edf2e2237cda8c1b79
] =

[Make _darcs/prefs/author be locale-encoded
Reinier Lamers <tux_rocker@reinier.de>**20090927175820
 Ignore-this: 72dd25c4ce3e9ce8578085edf4b48a03
] =

[Make amend-record store metadata as UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20090925162134
 Ignore-this: 637ef55122360eb4a655dab758b9762b
] =

[Add tests for rollback's storing metadata as UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20090925161841
 Ignore-this: b76c41118719f1ba9fa0981fc21f709d
] =

[Make UTF-8 test a bit more compact
Reinier Lamers <tux_rocker@reinier.de>**20090923090008
 Ignore-this: 6d032b6a9658af21a313dc55e6e8904a
] =

[Add tests to check that amend-record stores metadata in UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20090922200745
 Ignore-this: 1cde8b52b4946c3a05b89c30481af2b5
] =

[Resolve conflicts between UTF-8 and main branch
Reinier Lamers <tux_rocker@reinier.de>**20090922200654
 Ignore-this: 6b882e6cdd1b0657b708098152cec1e1
] =

[Add test for UTF-8 metadata
Reinier Lamers <tux_rocker@reinier.de>**20090917165327
 Ignore-this: 3e81237e8af61a45d64ac60269e1fe90 UTF-8
] =

[Make record store patch metadata in UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20090917165301
 Ignore-this: 6640e121987d6a76479e46d9cc14413b
] =

[resolve issue1392: use parsec to parse .authorspelling
caitt@users.sourceforge.net**20091220224123
 Ignore-this: 491f823882e9e2c9a49ad303ee6fb4ba
 .authorspelling file is now parsed using parsec.
 Parser reports errors (only affected line is discarded).
 Added escaping of commas.
] =

[fix the witnesses in prePushChatter
Ganesh Sittampalam <ganesh@earth.li>**20091219165001
 Ignore-this: 9309619e546d8f1cb85f085e991fdae
] =

[Resolve issue1712: darcs over-reports number of patches to pull
Luca Molteni <volothamp@gmail.com>**20091216230745
 Ignore-this: b1d41e85de83e4dae03144ea9a361510
] =

[remove unnecessary OPTIONS_GHC from Darcs/Commands/Record
Ganesh Sittampalam <ganesh@earth.li>**20091213233023
 Ignore-this: f7af5b8faf14f8a645017de575f7eab1
 This is needed to build this file on GHC 6.12, because there is a new
 extension picked up by -fglasgow-exts that makes 'rec' a keyword, and
 this file has a variable called that.
 =

 We should actually remove OPTIONS_GHC everywhere, but for now this is a
 minimal step to fix the build.
 =

] =

[add ImpredicativeTypes to extensions
Ganesh Sittampalam <ganesh@earth.li>**20091213232922
 Ignore-this: 8c73b05a8b0038d970c449ef094f7d8a
 This is needed to build on GHC 6.12.
 Before 6.14, we need to drop our uses of impredicativity as
 this is now deprecated.
 =

] =

[add GADTs to witnesses build
Ganesh Sittampalam <ganesh@earth.li>**20091213214653
 Ignore-this: a0def9ef02e1b8a359b3d4a14be25923
 =

 This extension is needed in many more files for GHC 6.12 which
 requires that it is specified for any file that pattern =

 matches on GADTs as well as any file that defines them.
 =

] =

[bump dependency upper bounds for GHC 6.12
Ganesh Sittampalam <ganesh@earth.li>**20091213214613
 Ignore-this: 73fffa554ba7fac293bdfe19fa886256
] =

[Fix regression in interactive UI patch summary.
Eric Kow <kowey@darcs.net>**20091208151545
 Ignore-this: 14b2651669678f49f92dfcd46ad7631
 I confused a False with a True in my attempt at refactoring this code.
] =

[resolve conflict
Ganesh Sittampalam <ganesh@earth.li>**20091213163138
 Ignore-this: b3bb7faf1719604f994c03e721492041
] =

[resolve issue835 show file with file directory arguments
Luca Molteni <volothamp@gmail.com>**20091209104221
 Ignore-this: f702162c7c078714a4d318bacaf70513
] =

[rename toCommute to toFwdCommute and fromCommute to toRevCommute
Jason Dagit <dagit@codersbase.com>**20091207225216
 Ignore-this: 9e2a43b5e28107c6e2ece192030ca575
] =

[remove no longer meaningful comments
Jason Dagit <dagit@codersbase.com>**20091207220000
 Ignore-this: 5f218698b6798e52b557b91966af96fe
] =

[remove commutex
Jason Dagit <dagit@codersbase.com>**20091115070356
 Ignore-this: dd35696f3202bab8573669254debf765
] =

[Reconciliate show version with CamelCasings
Florent Becker <florent.becker@ens-lyon.org>**20091211105637
 Ignore-this: 484ad4f6520a2e5d0f1edebc169ffdf6
] =

[sensible defaults for versioned show files
thomashartman1@gmail.com**20091125222845
 Ignore-this: 894194a59a0e0b940787ed5539588f30
] =

[add versioned show files functionality (darcs show files -p 'some patch')
thomashartman1@gmail.com**20091116013206
 Ignore-this: b746813de79050f3101f822324c3e6f5
] =

[LaTeX typo: \verbXfooX, not \verbXfoo\verbX.
Trent W. Buck <trentbuck@gmail.com>**20091209022043
 Ignore-this: f8fca53f1c4b7a4f7ab05e479aa19183
] =

[Resolve issue1594: define PREPROCHTML in makefile
Dave Love <fx@gnu.org>**20091123162006
 Ignore-this: ef15cf620728b30c141afb07e0d0ce1d
] =

[resolve issue1709: Short version of progress reporting was wrong.
quiark@centrum.cz**20091202183645
 Ignore-this: 51065958e4b46269e82e95876e5a82a2
] =

[Resolve issue1336: poor error message on --last "" (empty string to number=
s parser)
David Markvica <david@blueshellturtle.com>**20091115175546
 Ignore-this: 93b2708bc87ea0a8aefc49732455b14e
] =

[Resolve issue 1424: darcs get wrongly reports "using lazy repository" if y=
ou ctrl-c old-fashioned get
David Markvica <david@blueshellturtle.com>**20091114214132
 Ignore-this: e10e449b856ba9bc722bee26134e3aeb
] =

[Resolve issue1216: list Match section in ToC.
Trent W. Buck <trentbuck@gmail.com>**20091130065321
 Ignore-this: edebeeefc69d60a18c13a7c2358da57
] =

[Less implementation-oriented haddock for Darcs.Patch.Choices.
Eric Kow <kowey@darcs.net>**20091124011234
 Ignore-this: 49ee5781d14ea0b77b15039765241993
] =

[Accept issue1702: optimize --relink doesn't relink the cache.
Trent W. Buck <trentbuck@gmail.com>**20091125051641
 Ignore-this: c84443acb3486b4ea99d6b435545ab1b
] =

[Allow --no-foo to negate all --foo options
Florent Becker <florent.becker@ens-lyon.org>**20091120160307
 Ignore-this: e42f33bf1412ec0a76f7af683a46dc71
] =

[Consistently use "no-" prefix for new negative flags
Florent Becker <florent.becker@ens-lyon.org>**20091120155020
 Ignore-this: 43efbc7ddfd0eb2a7dc182bfc1a0c296
] =

[Add --to-all-files option to darcs changes
Florent Becker <florent.becker@ens-lyon.org>**20091111215707
 Ignore-this: 187c74a85f00df873220bf7675e2e7be
] =

[add --forward (opposite of --reverse)
Florent Becker <florent.becker@ens-lyon.org>**20091111212744
 Ignore-this: 943c48e02bd3873b62fbfa76abfe522a
] =

[add --case-cautious and --reserved-cautions
Florent Becker <florent.becker@ens-lyon.org>**20091111205915
 Ignore-this: 642289206e1d6904b98f34ff3c9731ec
] =

[add --skip-boring
Florent Becker <florent.becker@ens-lyon.org>**20091111203344
 Ignore-this: df4b509ec77271f4a55824a117964509
] =

[clean up queries in Darcs.Flags
Florent Becker <florent.becker@ens-lyon.org>**20091111202046
 Ignore-this: f825cbe291f3ee5ee2e73cc7d45d9e91
] =

[add --no-happy-forwarding
Florent Becker <florent.becker@ens-lyon.org>**20091111195443
 Ignore-this: 8412956ba7554e76b36744839bcc3657
] =

[add --apply-on-disk as counterpart to --store-in-memory
Florent Becker <florent.becker@ens-lyon.org>**20091111192804
 Ignore-this: c02d827d3c2cd56f79d8ed2b4adefc60
] =

[add a --traditional counterpart to --unified
Florent Becker <florent.becker@ens-lyon.org>**20091111182301
 Ignore-this: db42f3c4650a79fd901a9c4cdd594807
] =

[add --dont-delete-log-file option
Florent Becker <florent.becker@ens-lyon.org>**20091111172739
 Ignore-this: 9eba00d701fe068b625646fdefd937a2
] =

[Add --dont-ignore-times counterpart to --ignore-times
Florent Becker <florent.becker@ens-lyon.org>**20091111163250
 Ignore-this: dae02e31b456843e55c5600cfa2d3f2c
] =

[Accept issue1325: hunk patches interfere with pending minimisation.
Eric Kow <kowey@darcs.net>**20091010215038
 Ignore-this: 27d84309f9189ca362c5ad89bb000f9c
 =

 The test creates the following pending sandwich:
   add dir, move file to dir, delete dir
 Ideally this should crush down to just removing the file.  But this only
 happens if the file is empty.  Note that we perform this test twice,
 once with an empty file  and once with a non-empty file.
] =

[Camel case Darcs.Match and its exports.
Eric Kow <kowey@darcs.net>**20091127161527
 Ignore-this: dad9b7b1feb1b670b79863d4d41a3665
] =

[Camel case Darcs.Repository.Format and its exports.
Eric Kow <kowey@darcs.net>**20091127161152
 Ignore-this: d8a8a5383cbfd96a97f23f30b4c793a6
] =

[Camel case Darcs.Commands and its exports.
Eric Kow <kowey@darcs.net>**20091127160700
 Ignore-this: d4e6e87f8936d34e57c34fd447b17a9
] =

[Camel case Darcs.Commands.* and their exports.
Eric Kow <kowey@darcs.net>**20091127155852
 Ignore-this: c7bbb91909da7a9bba1707f7dbbe8db5
] =

[Camel case helper functions exported by Darcs.Commands.Help.
Eric Kow <kowey@darcs.net>**20091127155037
 Ignore-this: 37c951c7c8561dac0c93da0a184db92d
] =

[Camel case Darcs.Arguments and exports.
Eric Kow <kowey@darcs.net>**20091127144549
 Ignore-this: 1006be4fc8503ff63c274090571ea6bb
] =

[Camel case Darcs.Patch exported functions.
Eric Kow <kowey@darcs.net>**20091126133554
 Ignore-this: 1e3f790520118cee9f5cf1da4a3c9950
] =

[Camel case and rename Prim patch predicates.
Eric Kow <kowey@darcs.net>**20091126133325
 Ignore-this: c24c2244bb703da29b984752da8078ae
 The problem is that we can't just replace is_hunk with isHunk because the
 latter already exists.
] =

[resolve issue223, add --remote-darcs flag for remote darcs executable
Benedikt Huber **20091118155649
 Ignore-this: adb6bdc8ae27f98c63b8a39ba8eb750
 This patch adds a flag '--remote-darcs COMMAND' to specify the name of the=
 darcs
 executable on the remote end. Unfortunately it currently only works for re=
mote apply,
 not for the transfer mode optimization. The problem: SSH transfers are use=
d at many
 points in darcs (eg, HashedIO), where transfer flags are not available.
 The relevant starting points for fixing this are '[gz]fetchFilePS' in Exte=
rnal.hs.
] =

[Appease haddock.
Trent W. Buck <trentbuck@gmail.com>**20091122140135
 Ignore-this: 3240a0b6731ea0776deab72a85e97cd5
] =

[Add myself to .authorspelling file.
caitt@users.sourceforge.net**20091121234524
 Ignore-this: 32ad53f042bf813141fe53b184a0913f
] =

[More elaborate test for repair of a corrupt repository.
Petr Rockai <me@mornfall.net>**20091114170300
 Ignore-this: 3d38d136544b183e4a92f7dda0d4d52e
] =

[resolve issue1377: getProgname for local darcs instances
Benedikt Huber **20091117141754
 Ignore-this: d46f7d47fa663c8b68ab4a930ceb3e2e
] =

[replace commutex with commute in elegant_merge
Jason Dagit <dagit@codersbase.com>**20091114224243
 Ignore-this: 8d36808ae0de97a06fd4df9e401d7084
] =

[clean up elegant_merge
Jason Dagit <dagit@codersbase.com>**20091114223105
 Ignore-this: f85926d47fde8463588b72fa9323b2e0
] =

[resolve issue1308 push should warn about unpulled patches *before* patch-s=
election
Luca Molteni <volothamp@gmail.com>**20091115102701
 Ignore-this: 1f6fe64ad5cd84e7a8cae4261fcfa018
] =

[Add --dry-run to obliterate, since you'd better be sure
Florent Becker <florent.becker@ens-lyon.org>**20091113075346
 Ignore-this: 80d665adf9a83670c9f02bed6d84b508
] =

[use guards instead of ifs
pivo@pobox.sk**20091115160941
 Ignore-this: 5f514b01da4bd16642ce95a15b771ece
] =

[Hlint away a concatMap.
Eric Kow <kowey@darcs.net>**20091114145408
 Ignore-this: 43ea48bfe88923269cef6ea5b23f159f
] =

[Replace a (sequence.map) with mapM per hlint.
Eric Kow <kowey@darcs.net>**20091114144151
 Ignore-this: 2f8f50b6454a93639c784d0d0bd6f44e
] =

[hlint error: Use unless
Joachim Breitner <mail@joachim-breitner.de>**20091115191633
 Ignore-this: 16bc27e5225eba5206a2ff06a1a41e90
] =

[hlint error: Use unless
Joachim Breitner <mail@joachim-breitner.de>**20091115152810
 Ignore-this: c19c03cd0cdb6e5b8933c826f471b74b
] =

[Camel-case helper functions exported by Darcs.Commands.
Eric Kow <kowey@darcs.net>**20091115191609
 Ignore-this: 9555d3e3ea975ae6522f6e15bf015b8f
] =

[Camel case Darcs.Commands.CommandControl constructors.
Eric Kow <kowey@darcs.net>**20091031214316
 Ignore-this: e6119aa8845c89e43f568fb354c9c376
] =

[hlint warning: Use mapM instead of sequence
Joachim Breitner <mail@joachim-breitner.de>**20091115193111
 Ignore-this: 5674de4437e98d484064f61e20818324
] =

[Drop Commands.Remove from witnesses for now.
Petr Rockai <me@mornfall.net>**20091116130710
 Ignore-this: d69aee8d500ec99f35ea56b180a061a7
 =

 It now imports Add, which is not witness-enabled. The best fix would be to
 witness-enable Add as well, but this should at least fix the current witne=
ss
 breakage.
] =

[Updates to thank-you page: ilbot, donors, tweaks.
Eric Kow <kowey@darcs.net>**20091103183342
 Ignore-this: c729a612ea642a88d7229e4a4696b597
] =

[Resolve issue540: darcs remove --recursive
quiark@centrum.cz**20091115192344
 Ignore-this: 1c1bf04aef237e7b82b2fad4d45a0840
] =

[Remove does not fail only warns on already removed or not added files.
quiark@centrum.cz**20091115172010
 Ignore-this: 97721db92db7f8758922cdd1582f6276
] =

[hlint error: Use first instead of ***
Joachim Breitner <mail@joachim-breitner.de>**20091115144513
 Ignore-this: c19b8017696fee21ed4bb518b1fd6988
] =

[resolve issue1643: optimize --upgrade should do optimize
Christian Berrer <christian.berrer@gmx.at>**20091115123716
 Ignore-this: f437be2563974f9dad8576482797d23b
] =

[resolve issue1122: get --complete should not offer to create a lazy reposi=
tory
David Markvica <david@blueshellturtle.com>**20091115160201
 Ignore-this: da8a1d30869e6153c027ae396cc74d56
] =

[Fix a missing import after rushing a push of a hlint fix.
Petr Rockai <me@mornfall.net>**20091115160550
 Ignore-this: fc9f2a4dd2dfda2650feb3ef9e347768
] =

[hlint warning: Use isPrefixOf
Joachim Breitner <mail@joachim-breitner.de>**20091115151706
 Ignore-this: 9495dfcf9c7bc1750c580dccbaff05fb
] =

[hlint: span instead of break
Joachim Breitner <mail@joachim-breitner.de>**20091115142404
 Ignore-this: 85126abaf3f94a928d260b428d26bcde
 (darcswatch/roundup integration test patch, but still useful)
] =

[Rollback Kim's test harness improvements. :-(
Eric Kow <kowey@darcs.net>**20091115152744
 Ignore-this: 21f4a89439cefa790ff3f52b9170481
 The problem is that not everybody has the new time package so this
 would effectively break 'cabal install darcs'.
 =

 rolling back:
 =

 Sat Nov 14 23:55:23 CET 2009  Kim Wallmark <kim_darcsnet@arlim.org>
   * Annotate long-running tests to make optimization easier.
   =

   See http://bugs.darcs.net/issue1394
 =

     M ./Distribution/ShellHarness.hs -1 +11
] =

[Annotate long-running tests to make optimization easier.
Kim Wallmark <kim_darcsnet@arlim.org>**20091114225523
 Ignore-this: 7de2385c13b074baf119b7fe68ec62a4
 =

 See http://bugs.darcs.net/issue1394
] =

[Add a section title to distinguish darcs stuff from standard boring.
Eric Kow <kowey@darcs.net>**20091115085339
 Ignore-this: 2e052d6d0d2cb7646dcfc910b372545e
] =

[Use a custom boring file to get rid of tests-* and friends.
Petr Rockai <me@mornfall.net>**20091114085144
 Ignore-this: c3ca3f3ece042640580395ca5d903df2
] =

[little fix with hlint - changed map to all
Luca Molteni <volothamp@gmail.com>**20091114092250] =

[Add a comment to the performGC workaround in amNotInRepository function.
Petr Rockai <me@mornfall.net>**20091115085903
 Ignore-this: c4b520f2d6cd2fbcfbf4795f0ee5d9d8
] =

[Workaround a System.Directory.createDirectory issue.
Salvatore Insalaco <kirby81@gmail.com>**20091114161658
 Ignore-this: d8d0ce4e6c5b36484b46ed3b43993dc6
] =

[Resolve issue1224: refuse to convert a repo that's already in darcs-2 form=
at.
caitt@users.sourceforge.net**20091114152920
 Ignore-this: c041609d2b4a5815a309b572956185ec
] =

[Bump the hashed-storage dependency to >=3D 0.4.2.
Petr Rockai <me@mornfall.net>**20091114172021
 Ignore-this: 6b579a668ab03185e08bb99635553aca
] =

[fix -Wall warnings
Benedikt Schmidt <beschmi@gmail.com>**20091114150539
 Ignore-this: 47d0ee669304e0bde13add9a3d4ee8ec
] =

[Issue 1500: Providing more informative message about the nature of progres=
s numbers.
quiark@centrum.cz**20091114150900
 Ignore-this: 7f56c72e3d387ce878f78912a24e35ac
] =

[test fix for OSX
Kamil Dworakowski <kamil@dworakowski.name>**20091114113610
 Ignore-this: 43aae9f6ae527617845c9c1bb1180c18
] =

[HLint test: new comment syntax, new ignored warnings
Benedikt Huber **20091114085111
 Ignore-this: 82ed9eda12b9a0cf16c7defd5a40989d
] =

[resolve issue1636: match hunk
Kamil Dworakowski <kamil@dworakowski.name>**20091025122954
 Ignore-this: 75a9305d62af67e1f20df1c24e729ba3
 =

 A new primitive match type.
 =

 By Kamil and tat.wright
] =

[accept issue1636 match hunk
Kamil Dworakowski <kamil@dworakowski.name>**20091017165928
 Ignore-this: cbf726b778a4541d4e3a65d207f9d584
 =

 Add primitive match type to select patches which contain
 a given regex in some of their hunks.
] =

[remove trailing whitespace
Kamil Dworakowski <kamil@dworakowski.name>**20091003165321
 Ignore-this: 6d0a2c2a844da8f6e7d658ab878266df
] =

[Resolve issue1659: Make restrictBoring take recorded state into account.
Petr Rockai <me@mornfall.net>**20091105224138
 Ignore-this: a546eb6e27adf19a591e7a0c5e7b126
 =

 It is possible that boring files are part of the repository and we need to
 account for that by not filtering those files away in the boring filter.
] =

[Camel-case functions exported by Darcs.Repository.Prefs (and some more).
Eric Kow <kowey@darcs.net>**20091031202137
 Ignore-this: a45bed6bb4f3b7dec67cd44fd0630512
] =

[Haddock Darcs.Patch.Non addP and addPs.
Eric Kow <kowey@darcs.net>**20091011154306
 Ignore-this: 68ca7bd4bb2cbaba0d31d13ab124f6a3
] =

[Haddock the Darcs.Patch.Commute class a little bit.
Eric Kow <kowey@darcs.net>**20090419115951
 Ignore-this: 34c31031774e030b5e30ca00d15c4b49
] =

[Obliterate replacePristineFromSlurpy (prefer replacePristine).
Petr Rockai <me@mornfall.net>**20091024144221
 Ignore-this: 935d29ae5a60294dcef49322b903c0b0
] =

[Fix a number of unused import warnings.
Petr Rockai <me@mornfall.net>**20091024144157
 Ignore-this: c0f4e2ea044b28a5ac642188fc6b8fe5
] =

[Leverage replacePristine in optimize --pristine implementation.
Petr Rockai <me@mornfall.net>**20091024131945
 Ignore-this: 5d1d17e9b4807074e33feb2128a490c9
] =

[Fix replacePristine implementation on hashed repositories.
Petr Rockai <me@mornfall.net>**20091024131825
 Ignore-this: fcadf113b54397d9b8a19b395aa7fb75
] =

[A vastly more efficient implementation of LookForAdds.
Petr Rockai <me@mornfall.net>**20091025143536
 Ignore-this: ac7fe48eca1a546d268c001a1ee54e0e
] =

[Bump the hashed-storage dependency to >=3D 0.4.1.
Petr Rockai <me@mornfall.net>**20091025143507
 Ignore-this: f864fe06f2141e09f82b7fc6374f0e32
] =

[Refactor Darcs.Commands.Send
Florent Becker <florent.becker@ens-lyon.org>**20091015130743
 Ignore-this: 4f5bf11ead522774d5fec4a647b68e00
] =

[Refactor Darcs.Commands.Push
Florent Becker <florent.becker@ens-lyon.org>**20091015082818
 Ignore-this: 407791aa8c943d3b11fdae58fad381dd
] =

[Make applyItNow type signature work with GHC 6.8.3.
Eric Kow <kowey@darcs.net>**20091101172727
 Ignore-this: 8aa4d5060e12b14592c628bbb25d805e
] =

[Fix import conflict between Florent and Ganesh's patches.
Eric Kow <kowey@darcs.net>**20091101113443
 Ignore-this: 416a18c2ba511eb8f09f97d29553507f
] =

[Refactor Darcs.Commands.Apply
Florent Becker <florent.becker@ens-lyon.org>**20091008150429
 Ignore-this: a5640be910c748ddfb1abdcf139e8168
] =

[Add an extra newline in help text stored in author prefs.
Eric Kow <kowey@darcs.net>**20091031204617
 Ignore-this: 129fcfa77b9674022bcfc3484c0884f9
 This is for readability in the authors file.
] =

[Refactor Darcs.Commands.AmendRecord
Florent Becker <florent.becker@ens-lyon.org>**20091015123619
 Ignore-this: ff49a1b62bf6f742baadc40135b725c9
] =

[Refactor Darcs.Commands.Rollback
Florent Becker <florent.becker@ens-lyon.org>**20091014135055
 Ignore-this: b7bc2df749cd899b049df03ba6619d8c
] =

[Remove useless import of Verbose in Darcs.Commands.Unrecord
Florent Becker <florent.becker@ens-lyon.org>**20091014125045
 Ignore-this: 103705111b7c889e7af01529fc36ddde
] =

[Partially rewrite "darcs record" help.
Trent W. Buck <trentbuck@gmail.com>**20091011072907
 Ignore-this: 24faa598373a1e635068748d420202cf
] =

[Rewrite $DARCS_EMAIL documentation.
Trent W. Buck <trentbuck@gmail.com>**20090920131402
 Ignore-this: 1effc6cdcaed085edb4100b1a61bb712
] =

[Canonize Kari Hoijarvi, Matthias Fischmann, Thomas Hartman.
Eric Kow <kowey@darcs.net>**20091010221440
 Ignore-this: f175872b795f3860f276ae5174636d2d
 Also update Benedikt Schmidt and Marco T=C3=BAlio Gontijo e Silva.
] =

[Resolve issue1554: allow opt-out of -threaded (fix ARM builds).
Trent W. Buck <trentbuck@gmail.com>**20091031083717
 Ignore-this: 19823ea41b53b5b6ef2a3b5c19de7516
 GHC doesn't support -threaded on some architectures.
 This patch allows -f-threaded, so Darcs will compile again.
] =

[Typo: s/legal time/legal people/.
Trent W. Buck <trentbuck@gmail.com>**20091031112323
 Ignore-this: 7bda0f632143dd3fd16a17a8530f8392
] =

[Generalize, tidy up and expand license exceptions file.
Eric Kow <kowey@darcs.net>**20091010220606
 Ignore-this: 70c49d2f2a13e91eb90e5c940c4979ca
] =

[rename a local variable that doesn't have to be a list
Ganesh Sittampalam <ganesh@earth.li>**20091031105902
 Ignore-this: 67c627ced353c0218cb0a003c74c975b
] =

[Cabal flag for static binary (-fstatic)
Eric Kow <kowey@darcs.net>**20091030094621
 Ignore-this: e1c90c4ee7095c6b123f6b795f7ad9b1
] =

[add some haddock and rename a variable
Ganesh Sittampalam <ganesh@earth.li>**20091029214323
 Ignore-this: d2f569cc8c417f5f0c1fb01509d002a2
] =

[Resolve issue1588: add --skip-conflicts option
Ganesh Sittampalam <ganesh@earth.li>**20091026181917
 Ignore-this: 37b99f7461efe229cf5c601e197a5ca7
 =

 This option is for both pull and apply, and causes any patches that would
 cause conflicts to be skipped, either in interactive selection or by --all=
.
 =

] =

[Simplify donations page and make look more like other pages.
Eric Kow <kowey@darcs.net>**20091024173828
 Ignore-this: ad605ae27916b23578dfc086fcaa588
] =

[Resolve issue1563: official thank-you page.
Eric Kow <kowey@darcs.net>**20091024173132
 Ignore-this: 8783f87868458c5562c1e94f8bc48cbf
] =

[Simplify OT convergence test.
Eric Kow <kowey@darcs.net>**20091021095247
 Ignore-this: 2a118a47311ebb277f8b0571b056abd7
] =

[Accept issue1645: w -l should ignore symlinks.
Trent W. Buck <trentbuck@gmail.com>**20091011053838
 Ignore-this: ffaacd9f9ee93303b837a0f472636dfc
] =

[Update links to wiki in README.
Eric Kow <kowey@darcs.net>**20091020073349
 Ignore-this: d84716f510368214e04049930ffed27f
] =

[Resolve issue1652: suggest cabal update before cabal install.
Eric Kow <kowey@darcs.net>**20091020073105
 Ignore-this: de39107c4c324ee83d1a63d950e83a1c
] =

[Convert contextual patch printing from Slurpy to TreeIO.
Petr Rockai <me@mornfall.net>**20091019223402
 Ignore-this: 41151f22e5c2183a63ec7907d8678755
 =

 This obliterates another major source of SlurpDirectory usage in darcs. I =
agree
 the code has become a little more hairy, although this should be addressab=
le by
 a slight refactor of virtualTreeIO and friends in hashed-storage (there's
 currently no reasonable way to create a sub-monad in TreeIO).
] =

[Port list_* in Darcs.Arguments to Tree (away from Slurpy).
Petr Rockai <me@mornfall.net>**20091013104523
 Ignore-this: 435b566db26fb05d701f6af2db7683d4
] =

[Move a couple of low-level pending bits to (new) Repository.LowLevel.
Petr Rockai <me@mornfall.net>**20091013102853
 Ignore-this: c551781b8a5ff4039d5fbe01ccb79e1c
] =

[Use Commands.putInfo in Get
Florent Becker <florent.becker@ens-lyon.org>**20091006163121
 Ignore-this: 963b2f5a4eae94ecf541e083fe1e3b17
] =

[remove Darcs.Commands.Loggers
Florent Becker <florent.becker@ens-lyon.org>**20091008143843
 Ignore-this: a842d151779adff2fa3dc62cb3dbd5ee
] =

[Use Commands.put* in Darcs.Commands.Put
Florent Becker <florent.becker@ens-lyon.org>**20091002114915
 Ignore-this: 6315abca3c4187def549e3ddc3b3880
] =

[Use Commands.put* in Send
Florent Becker <florent.becker@ens-lyon.org>**20090930125215
 Ignore-this: eac3d780d4260cff4be6fdc8ee8cb7a2
] =

[Use Commands.putInfo in Push
Florent Becker <florent.becker@ens-lyon.org>**20091005141358
 Ignore-this: 4d7c87c69e6601d99ecc49d1d67512cf
] =

[Use Commands.putInfo in Check
Florent Becker <florent.becker@ens-lyon.org>**20091008141830
 Ignore-this: ac856fb051e1ac4919aaf555a1c63728
] =

[use Commands.put* in Convert
Florent Becker <florent.becker@ens-lyon.org>**20090929143942
 Ignore-this: b442184cc2c6da67e3eeae52832cfc52
] =

[Use Darcs.Commands.putVerbose in Apply
Florent Becker <florent.becker@ens-lyon.org>**20091008140754
 Ignore-this: ca622866f4e7bf122e5c6b0e6f077ba0
] =

[Use new Darcs.Commands.Put* in Add
Florent Becker <florent.becker@ens-lyon.org>**20091008135409
 Ignore-this: 22116c4cea0c5601bb5c4fa53dbdc6ac
] =

[typo in Hopefully.lhs
Florent Becker <florent.becker@ens-lyon.org>**20090922143044
 Ignore-this: 935b1906e53d2fa700f4d3f17ed62aca
] =

[Haddock documentation for Darcs.Patch.Core.Named
Florent Becker <florent.becker@ens-lyon.org>**20090918122203
 Ignore-this: 735d685fb7072a38302e987dbec85fea
] =

[add utility functions to Commands.lhs
Florent Becker <florent.becker@ens-lyon.org>**20090928130619
 Ignore-this: 856f9f8edb2e4aae13248e16bbd0e51c
] =

[fix warnings
Ganesh Sittampalam <ganesh@earth.li>**20091008223215
 Ignore-this: 4d23b80ae383bae9a80a14ec075f23f0
] =

[Fix bug in show_contents.sh test.
Eric Kow <kowey@darcs.net>**20091008121259
 Ignore-this: b69c8ff84bbe05e9a1c61746fd2af020
 It was in the wrong directory and was only passing due to being run within
 the Darcs darcs repository.
] =

[Remove redundant import of (</>).
Eric Kow <kowey@darcs.net>**20091007151050
 Ignore-this: 8113ba9f56ebcd1d7a5adc1f636fa027
 This also avoids a build error on Windows.
] =

[Resolve conflicts in Commands.Remove.
Petr Rockai <me@mornfall.net>**20091005112459
 Ignore-this: fee90e3bf4c0a80f86ec1cd6b16c0a42
] =

[Resolve conflicts in Commands.Apply.
Petr Rockai <me@mornfall.net>**20091005112443
 Ignore-this: 29b9db630ddfd3cc0117e0786cc275ea
] =

[Resolve conflicts in Commands.AmendRecord.
Petr Rockai <me@mornfall.net>**20091005112410
 Ignore-this: ee62b9758a009602b6807c97cfc9cf29
] =

[Resolve conflicts in darcs.cabal.
Petr Rockai <me@mornfall.net>**20091005112358
 Ignore-this: 1f4bf94965e19e3568c428360d0b47cb
] =

[Replace uses of readDarcsPristine with readRecorded.
Petr Rockai <me@mornfall.net>**20091004174913
 Ignore-this: ccedb958fb3bbcc95a512252cecda35c
] =

[Use --ignore-times with check to skip index check.
Petr Rockai <me@mornfall.net>**20091004171627
 Ignore-this: 149cbbe1e93d3802ce29cbb9d0820b4f
] =

[Make readRecorded independent of hashed-storage's readDarcsPristine.
Petr Rockai <me@mornfall.net>**20091004171514
 Ignore-this: c4e04b46ac32d00c4f4ba73f1c0abba9
] =

[Add a bunch of haddocks to Repository.State.
Petr Rockai <me@mornfall.net>**20091001134622
 Ignore-this: c8def50a9919a03f579f0e8165b7d5a9
] =

[Resolve conflict between optimize --upgrade and optimize --pristine.
Petr Rockai <me@mornfall.net>**20091001085946
 Ignore-this: f0717730f16d4079da42d23d01d209d6
] =

[Resolve conflict in darcs.cabal (hashed-storage dependency).
Petr Rockai <me@mornfall.net>**20091001085931
 Ignore-this: 6b89341c8d8a61b8dd9434a18591c69e
] =

[Add a missing copyright notice to Darcs.Diff.
Petr Rockai <me@mornfall.net>**20090927154727
 Ignore-this: 47c82bc3bc5d219b75f0da56e5d457bc
] =

[allow State.hs to compile with type witnesses
Jason Dagit <dagit@codersbase.com>**20090925094029
 Ignore-this: e9bbca73fc7a00ae8794af0790257f28
] =

[Clarify that empty path list means everything, restrictSubpaths.
Petr Rockai <me@mornfall.net>**20090923165532
 Ignore-this: efcd3d88bb1af54d1f6272994574bc57
] =

[Don't forget to limit pending to relevant paths, in unrecordedChanges.
Petr Rockai <me@mornfall.net>**20090923165358
 Ignore-this: 2ed0d1d4e14d63dbc16f9c0a77bcffcb
] =

[Add Darcs.Diff and Darcs.Repository.State created in the Gorsvet refactor.
Petr Rockai <me@mornfall.net>**20090913180405
 Ignore-this: c6f25a91f62cae0560d9be4820e03c53
] =

[Remove the remnants of Gorsvet.
Petr Rockai <me@mornfall.net>**20090912201333
 Ignore-this: a4725818943b1ef2d9084904a391da38
] =

[Explode Gorsvet into a number of more appropriate places.
Petr Rockai <me@mornfall.net>**20090912193130
 Ignore-this: 688515e833df250a8970f2ea3d182ae3
] =

[Move the FooDirectory instances from Gorsvet to Darcs.IO.
Petr Rockai <me@mornfall.net>**20090912174204
 Ignore-this: b2b488cffe725def2f29b22cd68d83d7
] =

[Reformat the export list of Darcs.Repository.
Petr Rockai <me@mornfall.net>**20090912172909
 Ignore-this: 5d6c450934ace601173d22c50f80ac99
] =

[Resolve issue1488: darcs-hs does not suffer from this.
Petr Rockai <me@mornfall.net>**20090912152215
 Ignore-this: 324d86a77cb45413d0d4c7b1159c62e1
] =

[Unreadable pristine ought not be fatal for repair.
Petr Rockai <me@mornfall.net>**20090912151816
 Ignore-this: 1c4d057e70d981bcf5711b8d1518117e
] =

[Remove code for repair-from-checkpoint.
Petr Rockai <me@mornfall.net>**20090912150147
 Ignore-this: 91fbb56fd69b801fa06eaa364e24afcb
] =

[Update to latest hashed-storage API: updateIndex is global now.
Petr Rockai <me@mornfall.net>**20090912145934
 Ignore-this: edcc0e4a74360bfc987fc2abe3249316
] =

[Resolve conflict with haskell_policy -> hlint.
Petr Rockai <me@mornfall.net>**20090912145900
 Ignore-this: 2c2e56fbc4bed294380b13fe7cc1cf96
] =

[We no longer use pristine timestamps in any way.
Petr Rockai <me@mornfall.net>**20090912141442
 Ignore-this: b2254899a231f7f151e5b2ab0e74a233
] =

[Detect and fix bad index in darcs repair.
Petr Rockai <me@mornfall.net>**20090912101630
 Ignore-this: 9e544484042571d40c5fbe7824ebeea8
] =

[Drop unused import.
Petr Rockai <me@mornfall.net>**20090907180209
 Ignore-this: ccd6913a37b63c0b6599eef7c4f66619
] =

[Fix up for hashed-storage API shuffling.
Petr Rockai <me@mornfall.net>**20090907180144
 Ignore-this: b79d289dea1ea663df0e665bba03eb9f
] =

[Resolve conflict (duplicate, even) with Trent.
Petr Rockai <me@mornfall.net>**20090830102736
 Ignore-this: 2149335dcfe81efea240f3818788cbd
] =

[Resolve conflict with Eric's cleanup.
Petr Rockai <me@mornfall.net>**20090830102136
 Ignore-this: 4608cf2a1d7c8265193b796ee1d9d248
] =

[Remove extraneous invalidateIndex from revert.
Petr Rockai <me@mornfall.net>**20090811135655
 Ignore-this: 4ea939685337e19946d587dc6d861614
] =

[Add a --pristine option to optimize.
Petr Rockai <me@mornfall.net>**20090811105119
 Ignore-this: aadae51b824aff9ea651e6312f0cff69
] =

[Make darcs optimize rearrange pristine.hashed when needed.
Petr Rockai <me@mornfall.net>**20090810220600
 Ignore-this: 4aeb09ca34c6189466a87ce3443a1c42
 =

 This is triggered when the pristine.hashed format uses the size-prefixed h=
ash
 format -- like 0000000064-<hash>. The optimize writes out a size-less pris=
tine
 tree that moreover uses stable (sorted by name) directory listing format, =
and
 therefore stable directory hashes. This layout gives optimal performance w=
ith
 HSI4-format index.
] =

[Fix compilation after minor hashed-storage API rename.
Petr Rockai <me@mornfall.net>**20090808205346
 Ignore-this: 9363a94075aeb18c32f64791d5f4da9b
] =

[Use withDirectory to implement mInCurrentDirectory.
Petr Rockai <me@mornfall.net>**20090807185527
 Ignore-this: 1013edaf34a06af97b639ed974295780
] =

[Implement index checking functionality in darcs check.
Petr Rockai <me@mornfall.net>**20090807153017
 Ignore-this: a0b7d0bca968a488da13e1473e892cb4
] =

[Adapt to the new safety-improved readIndex API.
Petr Rockai <me@mornfall.net>**20090807101840
 Ignore-this: 7117a8586ac358755708c8ff42735d2
] =

[Add a testcase of diffing various trailing/missing newline combinations.
Petr Rockai <me@mornfall.net>**20090806141308
 Ignore-this: 711a9bdf323d26a3550e650510425720
] =

[Clean up unused bits and imports in Repository.Checkpoint.
Petr Rockai <me@mornfall.net>**20090806065904
 Ignore-this: dacae1922b73496df181b98f5a3d2848
] =

[Remove now-unused Darcs.Diff module.
Petr Rockai <me@mornfall.net>**20090806065216
 Ignore-this: 94497dfcf962f405c004bc32c14ad311
] =

[Use treeDiff in external_merge instead of unsafeDiff.
Petr Rockai <me@mornfall.net>**20090806065209
 Ignore-this: 959f7c712d70abbd2337b0c35f300f38
] =

[Remove unused syncPristine from Repository.Pristine.
Petr Rockai <me@mornfall.net>**20090806065139
 Ignore-this: 7d9c88c4624889ddded767fb5fbedabd
] =

[Take a Tree instead of Slurpy in external_resolution.
Petr Rockai <me@mornfall.net>**20090806064627
 Ignore-this: d6dc217d813f87b615141590e142db40
] =

[Preliminary version of the replace command with s/unsafeDiff/treeDiff/.
Petr Rockai <me@mornfall.net>**20090805194544
 Ignore-this: ca952f6f1e994e49254ec622aefb088d
] =

[Port to new readIndex interface in hashed-storage 0.4.
Petr Rockai <me@mornfall.net>**20090805183526
 Ignore-this: a3f79f9e4aa80e8e532ab8674453d6cd
] =

[Haddock invalidateIndex.
Petr Rockai <me@mornfall.net>**20090805183512
 Ignore-this: 442fe0c54fe043f73a8ca378b49605e9
] =

[Port to generalised Tree types (mostly just signature wibbling).
Petr Rockai <me@mornfall.net>**20090803084656
 Ignore-this: c29c995e98c3ea6d76b74a01de1e21b5
] =

[Get rid of wait_a_moment, since we do not use pristine timestamps anymore.
Petr Rockai <me@mornfall.net>**20090802122812
 Ignore-this: edc0a7b42793e31ededc4d63a9ec5496
] =

[Port to hashed-storage 0.4 Hash changes.
Petr Rockai <me@mornfall.net>**20090727105435
 Ignore-this: 19a8b50253ba13056c7a4f535b1f6c50
] =

[Obliterate timestamp manipulation in HashedIO.
Petr Rockai <me@mornfall.net>**20090720165836
 Ignore-this: b98311e3ec5ca2d88d251ff2afe67b31
] =

[Obliterate all instances of sync_repo and friends, since they are useless =
now.
Petr Rockai <me@mornfall.net>**20090720165700
 Ignore-this: 9225b11cb51cd0a35a3db1df25548304
] =

[Re-implement make_remove_patch in remove command, replacing Slurps with Tr=
ees.
Petr Rockai <me@mornfall.net>**20090720164717
 Ignore-this: fe98fa6720e6d129de3e6f364fc7ba91
] =

[Avoid removing in-use files on win32.
Petr Rockai <me@mornfall.net>**20090720105654
 Ignore-this: 4951404baa3b6226f53629f97a1b7dc4
] =

[Remove now-unused checkPristineAgainstSlurpy.
Petr Rockai <me@mornfall.net>**20090720093843
 Ignore-this: b41cc7ee14e954f7d4711df66f6f5537
] =

[Port the replay (check/repair) functionality to hashed-storage.
Petr Rockai <me@mornfall.net>**20090720072018
 Ignore-this: a1e2c32ac633e72a8b20e830232cef5
 =

 This removes a few unsafeDiff users. It also simplifies the replay code by=
 not
 threading the Slurpy all over the place (instead placing applyAndFix in th=
e
 TreeIO monad). There is a slight risk of regressions (and a moderate risk =
of
 space leaks).
] =

[Optimize darcs show contents --match (avoid slurping pristine).
Petr Rockai <me@mornfall.net>**20090716083218
 Ignore-this: c611f7eff91b80fe2bdf598b68bea454
] =

[Proper implementation for mDoesFileExist/mDoesDirectoryExist in Gorsvet.
Petr Rockai <me@mornfall.net>**20090716082525
 Ignore-this: 90dc8dbab055b3a78e05ff26e1605f6f
] =

[Provide readPending that also provides the "pending conflicts" check nativ=
ely.
Petr Rockai <me@mornfall.net>**20090716082347
 Ignore-this: a7d148120c8be0844d05ba9a983bc6a7
] =

[Resolve conflict.
Petr Rockai <me@mornfall.net>**20090710141253
 Ignore-this: 3a7c406f2f5460925b938f7ee5d6780e
] =

[Clean up unused imports in WhatsNew.
Petr Rockai <me@mornfall.net>**20090628203201
 Ignore-this: 13a58bf3241a684b1484aac1859848b0
] =

[Remove unused import from Gorsvet.
Petr Rockai <me@mornfall.net>**20090622113432
 Ignore-this: 224d5e137d60f17031d61f7537c6ba16
] =

[Invalidate the index in add_to_pending, as it was getting rebuilt too soon=
.
Petr Rockai <me@mornfall.net>**20090622113239
 Ignore-this: 103f6b53d3bdc663b60cfa5d7e15d6af
] =

[Clean up unused bits from Repository.Internal.
Petr Rockai <me@mornfall.net>**20090621143025
 Ignore-this: 5686ee1be7112b52217ab50a1c37d310
] =

[Move add_to_pending to Repository, use unrecordedChanges.
Petr Rockai <me@mornfall.net>**20090621142531
 Ignore-this: b35e0e7848c766dfc37cf570f254c48a
] =

[Move tentativelyMergePatches and friends to a new module, Repository.Merge=
.
Petr Rockai <me@mornfall.net>**20090621141923
 Ignore-this: 6348929868d146f5877e5e6529754521
 =

 This allows tentativelyMergePatches to use unrecordedChanges from Gorsvet
 without forming import cycles.
] =

[Unexport get_unrecorded* from Repository, remove unused functions from Int=
ernal.
Petr Rockai <me@mornfall.net>**20090621134230
 Ignore-this: 51384d4c19da07ea40cab0837effded8
] =

[Use index-based diffing in "darcs wh -l".
Petr Rockai <me@mornfall.net>**20090621134141
 Ignore-this: 2c8442430fdae83bcdff14f2af3db2a0
] =

[Also use index-based diffing in unrecord/obliterate.
Petr Rockai <me@mornfall.net>**20090621133956
 Ignore-this: 92a5a543663f0be15bb7f6f29980fa
] =

[Make revert use index-based diffing.
Petr Rockai <me@mornfall.net>**20090621133923
 Ignore-this: 58455b357380c3c2759d49edd119a16d
] =

[Use index-based diffing in unrevert.
Petr Rockai <me@mornfall.net>**20090621133900
 Ignore-this: 4624459642538a8c01a8eff93a865be6
] =

[Flip AmendRecord to index-based diffing, too.
Petr Rockai <me@mornfall.net>**20090621133832
 Ignore-this: 7c64b91e9a2894433c3f8b78097949b8
] =

[Use index-based diffing in Remove.
Petr Rockai <me@mornfall.net>**20090621133755
 Ignore-this: 39f154578a0ed352557157718f683785
] =

[Flip "darcs mark-conflicts" over to index-based diffing.
Petr Rockai <me@mornfall.net>**20090621133730
 Ignore-this: d92ff953fb0b6a817065a7209ee08aa3
] =

[Flip "darcs changes" to index-based diffing.
Petr Rockai <me@mornfall.net>**20090620201922
 Ignore-this: 56b93cec4eb2ade271687d8bb969c16c
] =

[Use index-based diffing in Record.
Petr Rockai <me@mornfall.net>**20090611223612
 Ignore-this: f4862b1ff2fe8e91ed088ac4f03c38b8
] =

[Resolve issue1447: different online help for send/apply --cc
mf-hcafe-15c311f0c@etc-network.de**20091007162240
 Ignore-this: cab61431c861e4e346f34c00f4dd26bf
] =

[Resolve issue1583: on darcs get, suggest upgrading source repo to hashed.
Eric Kow <kowey@darcs.net>**20090923210811
 Ignore-this: a4b801876ff76674a110f5c63388d68a
] =

[added regression test for issue1632
benjamin.franksen@bessy.de**20091002095359
 Ignore-this: 4a0a48021f54d7a3f8def74b1c798652
] =

[Marginalia regarding TeX documentation.
Trent W. Buck <trentbuck@gmail.com>**20091003082621
 Ignore-this: c204ce845db6b83b1d2ddf5dba2f1a31
] =

[Avoid fugly "tests_network-.dir".
Trent W. Buck <trentbuck@gmail.com>**20091002085528
 Ignore-this: aa807dad285ad2b9e7a06b5fffa0b4ca
] =

[Fix plurality in a docstring.
Trent W. Buck <trentbuck@gmail.com>**20091002075501
 Ignore-this: e6583c262335a0cb34a29aa1d3a01141
] =

[Mention darcs changes --repo.
Trent W. Buck <trentbuck@gmail.com>**20091002075336
 Ignore-this: 4342a066405b3f900b4356ab17c50534
 This handy bit of functionality should be more discoverable.
 I only found it mentioned in passing in one of droundy's bug reports.
] =

[Partially rewrite "darcs apply" help.
Trent W. Buck <trentbuck@gmail.com>**20090920115824
 Ignore-this: 92686c3bffc4beb6fad702967346b86a
] =

[Partially rewrite "darcs annotate" help.
Trent W. Buck <trentbuck@gmail.com>**20090920102314
 Ignore-this: b6bc982424ac641c35085f0a0c6bb97f
] =

[Also test for apply posthook in issue942.
Eric Kow <kowey@darcs.net>**20090930221536
 Ignore-this: b716d577e2f9423e03dc30d9954c6320
] =

[Camel-case functions exported by Darcs.Patch.Choices.
Eric Kow <kowey@darcs.net>**20090921092446
 Ignore-this: de5863ac95deabfe8bdcf35de07e0c6c
] =

[resolve issue1620: amend lies about living logfile
Kamil Dworakowski <kamil@dworakowski.name>**20090924212910
 Ignore-this: 57028d63cd6fd3bc290cf923ccc266e3
 =

 Remove "atexit remove" from world_readable_temp. Instead make sure that
 callers of the world_readable_temp cleanup after themselves. Only
 AmendRecord and Tag were not doing it already.
 =

] =

[camelCase clarify_errors
Kamil Dworakowski <kamil@dworakowski.name>**20090924204827
 Ignore-this: b54b8fa73ddb1ceb85bfb1a024eae7f4
] =

[Resolve issue 1618: preserve log on amend failure
Kamil Dworakowski <kamil@dworakowski.name>**20090924204334
 Ignore-this: 69f14addad73eb63489220bb11dfb016
 =

 Print a msg to the user saying where the log was saved, in case of failure=
.
 =

] =

[remove trailing whitespace
Kamil Dworakowski <kamil@dworakowski.name>**20090924185145
 Ignore-this: 6c1aeed210b96588f6730a174bda8048
] =

[accept issue1618: amend should preserve the logfile
Kamil Dworakowski <kamil@dworakowski.name>**20090918232544
 Ignore-this: 89958db98efeeff7f59c7df847052578
 =

 When Susan amends a patch with --edit-long-comment, she would not like to
 lose her editorial work in case of a test failure on committing.
 =

] =

[accept issue1620: record lies about leaving the logfile
Kamil Dworakowski <kamil@dworakowski.name>**20090918231008
 Ignore-this: 9ab7503f13d5480e9d767844310a544b
 =

 In case of failure, record says it left the logfile in
 such and such a file. The file does not exist though.
] =

[fix witnesses in Darcs.Commands.Remove
Ganesh Sittampalam <ganesh@earth.li>**20090928214205
 Ignore-this: 1b8158653d00224e5972fa19458c40c8
] =

[Option comments to the top in Split.hs for GHC 6.8.3
Thorkil Naur <naur@post11.tele.dk>**20090928201345] =

[add newly-witnessed modules to witnesses.hs
Ganesh Sittampalam <ganesh@earth.li>**20090909200711
 Ignore-this: 5f6c6ec561586c01956c3a7ff228ab3d
] =

[need RankNTypes for some of the newly witnessed modules
Ganesh Sittampalam <ganesh@earth.li>**20090909200643
 Ignore-this: d9bd0724f91b6a435d75ca8d93ac24fd
] =

[add witnesses to Darcs.Commands.Send
Ganesh Sittampalam <ganesh@earth.li>**20090909200151
 Ignore-this: ab87388a6d4469998568784aa36087d8
] =

[add witnesses to Darcs.Commands.Push
Ganesh Sittampalam <ganesh@earth.li>**20090909195258
 Ignore-this: c0ce49e56d76fc29fb17a9476d95bac5
] =

[add witnesses to Darcs.Commands.Apply
Ganesh Sittampalam <ganesh@earth.li>**20090909194800
 Ignore-this: d7975514d3aea9b53a0b9248c2a50b06
] =

[add witnesses to Darcs.Commands.Pull
Ganesh Sittampalam <ganesh@earth.li>**20090909194407
 Ignore-this: 51eb38f21152e1d3d348bff37aea0ddd
] =

[add witnesses to Darcs.Commands.TrackDown
Ganesh Sittampalam <ganesh@earth.li>**20090909193441
 Ignore-this: 8081b7aa9856ca109b9ef41a5b24725e
] =

[add witnesses to Darcs.Commands.Remove
Ganesh Sittampalam <ganesh@earth.li>**20090909193405
 Ignore-this: b2b55b15428a0d174338ab5ad13d8f9b
] =

[add witnesses to Darcs.Commands.Diff
Ganesh Sittampalam <ganesh@earth.li>**20090909193013
 Ignore-this: 5fb4fb83967232f11dde5c62c919a531
] =

[improve documentation of Darcs.Patch.Split
Ganesh Sittampalam <ganesh@earth.li>**20090927211902
 Ignore-this: ae40fc26efb2e8b997ccf45eb36ec832
] =

[clean up types in win32/System/Posix.hs
David Roundy <droundy@darcs.net>**20090329223958
 Ignore-this: 80fb3dcbc0bb296d7b7337905bcf12564f8e79f4
] =

[Resolve issue291: add (basic) interactive patch splitting
Ganesh Sittampalam <ganesh@earth.li>**20090919004053
 Ignore-this: 47b8c8da80f5ca5c3f86e2f11ec2192d
] =

[Rolling back broken patch
Ganesh Sittampalam <ganesh@earth.li>**20090923210406
 Ignore-this: 6a302cea606fa656a87140b5e2122317
 =

 It needs type witnesses to be added to Darcs.Diff, but that patch
 hasn't been merged yet and probably won't be due to a conflict with
 darcs-hs
 =

 rolling back:
 =

 Mon Aug 31 00:46:47 BST 2009  Ganesh Sittampalam <ganesh@earth.li>
   * add some QC properties that demonstrate the problem with canonizeFL
 =

     M ./src/Darcs/Test/Patch/QuickCheck.hs -4 +61
] =

[Fix breakage in manual introduced by darcs optimize --upgrade.
Eric Kow <kowey@darcs.net>**20090923210341
 Ignore-this: f01f12460b26b0333da4650e6d1e485
] =

[This patch is broken.
Ganesh Sittampalam <ganesh@earth.li>**20090923205150
 Ignore-this: 46db0aba7910c02b3317f20fe86a2fb1
 =

 It needs type witnesses to be added to Darcs.Diff, but that patch
 hasn't been merged yet and probably won't be due to a conflict with
 darcs-hs
 =

 rolling back:
 =

 Mon Aug 31 00:46:47 BST 2009  Ganesh Sittampalam <ganesh@earth.li>
   * add some QC properties that demonstrate the problem with canonizeFL
 =

     M ./src/Darcs/Test/Patch/QuickCheck.hs -4 +61
] =

[Resolve issue1584: Provide optimize --upgrade command.
Eric Kow <kowey@darcs.net>**20090922201149
 Ignore-this: e72ddff8c879de637e6a7dcb824624d6
 This can be used for an inplace upgrade to the latest hashed format.
 Right now it only handles old-fashioned =3D> hashed, but there may be
 future format changes for which this can be reused.
] =

[Test for issue1584, the optimize --upgrade feature.
Eric Kow <kowey@darcs.net>**20090902060031
 Ignore-this: 5c3032156f75f224f08fa19e5311a0d3
] =

[add some QC properties that demonstrate the problem with canonizeFL
Ganesh Sittampalam <ganesh@earth.li>**20090830234647
 Ignore-this: 478c798414f37433b715d87ccb4e51d2
] =

[Simplify and camel-case setSimplys.
Eric Kow <kowey@darcs.net>**20090921075951
 Ignore-this: 296a4bbebbb5788a8049be8ed591deec
] =

[Move make_everything_later type signature next to implementation.
Eric Kow <kowey@darcs.net>**20090921090952
 Ignore-this: 16f11d9fcc22370927c643fdec53ab0f
] =

[Simplify EXAMPLE.sh.
Eric Kow <kowey@darcs.net>**20090825152531
 Ignore-this: c6e4bbb3b241b2fb0af10ae9e519fa3e
 =

 1. Don't clean up.  When you're working on just one test, it's easier
    to figure out if the test is correct if you have access to the
    repository.  Pre-flight cleanup by all test scripts is now essential.
 =

 2. Don't rely on --repo except for init (where it saves some boilerplate)
    a) Makes test scripts more natural and straightforward to write.
    b) Reduces the number of variables that we are testing, ie.
       ensuring that --repo path handling is working correctly at all times=
.
] =

[Haddock some of Darcs.Patch.Choices.
Eric Kow <kowey@darcs.net>**20090919200319
 Ignore-this: 1f8bb5b1bd0af5428db5229aa889518a
] =

[Move some core-specific modules into Darcs.Patch in cabal file.
Eric Kow <kowey@darcs.net>**20090812145908
 Ignore-this: 553684a52f09658f9772e959932b58e9
] =

[Move OldDate module to Darcs.Patch.OldDate.
Eric Kow <kowey@darcs.net>**20090812145810
 Ignore-this: 6caaa480c4f69809c82d681de505f59e
] =

[Move RegChars module to Darcs.Patch.RegChars.
Eric Kow <kowey@darcs.net>**20090812122940
 Ignore-this: a919cf75cfe1cabf39637283973b3cc
 We should discourage changes to this module as it affects how token-replac=
e
 patches are interpreted.
] =

[Camel-case fileExists exported by Darcs.Commands.Record.
Eric Kow <kowey@darcs.net>**20090917080506
 Ignore-this: 4fb232312e43564d8eac905ae28e0c8c
] =

[Camel-case getLog and getDate exported by Darcs.Commands.Record.
Eric Kow <kowey@darcs.net>**20090917080436
 Ignore-this: 1d712c44fadaf6389f99de033a14e910
] =

[Remove old LWN quote from homepage.
Eric Kow <kowey@darcs.net>**20090826132645
 Ignore-this: 3a50f376884439e1af24729743eae4a5
] =

[Rewrite "darcs show repo" help.
Trent W. Buck <trentbuck@gmail.com>**20090920071721
 Ignore-this: f3d548bde2ccb324259f0e2ddb471856
] =

[Remove an obsolete remark from TeX.
Trent W. Buck <trentbuck@gmail.com>**20090920063813
 Ignore-this: 3d0f49f2648411fad57935c31cc83097
] =

[Remove duplicated documentation.
Trent W. Buck <trentbuck@gmail.com>**20090914033822
 Ignore-this: c53923d7aa40d455076571e2c7a390fb
] =

[Fix "make website".
Trent W. Buck <trentbuck@gmail.com>**20090920061654
 Ignore-this: fed73b55c61c0c558440d254152c5407
 Updates to command_help docstrings weren't triggering a rebuild of the
 user manual (which includes them).
] =

[Include missing .tex files in the cabal source tarball.
Petr Rockai <me@mornfall.net>**20090920154941
 Ignore-this: f0cdd39148648f463f172af7385a8d85
] =

[Distribute GNUmakefile in the cabal tarball (for manual building).
Petr Rockai <me@mornfall.net>**20090920154512
 Ignore-this: 3b5743d657574f25da80641ce0e437e3
] =

[There's no longer a bugs/ directory, so remove from .cabal.
Petr Rockai <me@mornfall.net>**20090919143854
 Ignore-this: 4ad612ab6d23c2b65ae21e873157d0a5
] =

[Remove the no-longer-existing darcs.cgi bits from cabal file.
Petr Rockai <me@mornfall.net>**20090919143808
 Ignore-this: 376ec57dfa6030b00b410876550a9bf4
] =

[Update website to link to 2.3.1 tarball
Reinier Lamers <tux_rocker@reinier.de>**20090920185811
 Ignore-this: 66fe324d61e0201c02c8b5b6db03d1a9
] =

[add canonization function for FL Prim
Ganesh Sittampalam <ganesh@earth.li>**20090919004011
 Ignore-this: 981d7f6a10c7800cabbe96a046a3b76e
] =

[add substitution mechanism for PatchChoices
Ganesh Sittampalam <ganesh@earth.li>**20090803055723
 Ignore-this: ad61b387b18796c770e70a5b4673269a
] =

[camelCase recently added functions
Ganesh Sittampalam <ganesh@earth.li>**20090919105112
 Ignore-this: b2eeda02acabdcaed819c19f18bbddc3
] =

[Add utility code for editing text
Ganesh Sittampalam <ganesh@earth.li>**20090728174051
 Ignore-this: c29b0eed3a5f88aded98a572291b3c5f
] =

[break out and export run_editor utility function
Ganesh Sittampalam <ganesh@earth.li>**20090728173756
 Ignore-this: 27f7117cf6e431dc7c8bf2aee6bfcd03
] =

[add "parallel pairs"
Ganesh Sittampalam <ganesh@earth.li>**20090727175847] =

[change the type of gcau to reflect its behaviour
Ganesh Sittampalam <ganesh@earth.li>**20090909193221
 Ignore-this: 5c6b665759572262c0bae0b4b1da20f4
 Previously it returned RL (RL ...) but the outer RL was always singleton.
 Changing this to RL ... simplifies a lot of client code that was just assu=
ming
 this behaviour by doing things like taking the head.
] =

[make type of checkUnrelatedRepos more general
Ganesh Sittampalam <ganesh@earth.li>**20090908210652
 Ignore-this: 8f2559da573ea899cef219e67dd5229a
 There's no reason why two repos we are comparing for relatedness should ha=
ve
 the same ending context.
 =

] =

[resolve issue1300: logfile deleted on unsucessful record
Kamil Dworakowski <kamil@dworakowski.name>**20090917080320
 Ignore-this: ead95914b26e0df6a79450a1d955abe3
 =

 Don't honour --delete-logfile when the record fails for any reason, a test
 failure for instance.
 =

 I have changed the definition of get_log not to delete the logfile, but to
 return it for deferred deletion. I capitalized on the fact that get_log
 was already returning (Just temp_logfile) for deferred deletion.
 =

 get_log is an exported name, used in AmendRecord, Tag and Rollback. Some
 of them ignore the logfile to delete, though none of them accept
 --delete-logfile flag, and thus they don't need to change, nor are they
 affected in any way.
 =

 Unintended side effect of the change: with --delete-logfile flag present, =
a
 massage '"Logfile left in " ++ filepath' gets printed in case of the test
 failure on record. This may actually be desirable so I did not bother to
 change it.
 =

] =

[modify issue1300 test to fail for the right reason
Kamil Dworakowski <kamil@dworakowski.name>**20090915090307
 Ignore-this: daae62898293f2871023f52d25a8eb4f
] =

[Accept issue1610: bug in get_extra with darcs 1 semantics only.
Eric Kow <kowey@darcs.net>**20090916203310
 Ignore-this: 472377371656bce68cb9404db284fa71
 I accidentally stumbled upon this trying to write the issue1609 test.
] =

[Accept issue1609: Operational Transformations TP2 on conflict marking.
Eric Kow <kowey@darcs.net>**20090916214446
 Ignore-this: c1ac116a3371e8b7ed2813d4d3e78156
] =

[relicense Darcs.Commands.GZCRCs as BSD3
Ganesh Sittampalam <ganesh@earth.li>**20090915200307
 Ignore-this: 687099f40110c6cea2773bc96b89300d
] =

[Fix a (somewhat bogus) unused-module warning in Ssh.
Petr Rockai <me@mornfall.net>**20090916115545
 Ignore-this: fbc1f9268080c7d8b4bcefee0d5827c6
] =

[Re-implement haskell_policy in terms of hlint.
Petr Rockai <me@mornfall.net>**20090807065736
 Ignore-this: 15fbaf506ae0569d904c1ed2543abc30
 =

 This also comes with a change to the ratification mechanism, which now use=
s a
 separate Ratified module, from which you have to import the unsafe
 functions. Requires a recent hlint.
] =

[test that tentative leftover is cleared
Kamil Dworakowski <kamil@dworakowski.name>**20090913221009
 Ignore-this: 47ec5121156f4a0c7adc9d7f2f0e18d7
] =

[extend issue1406 test
Kamil Dworakowski <kamil@dworakowski.name>**20090913213152
 Ignore-this: e720fa9858a5b1e8b767ba009d4d1d9
 =

 extend with checkpoint modification checking
] =

[regression test for amend-record with failed test
Kamil Dworakowski <kamil@dworakowski.name>**20090913213000
 Ignore-this: de5fd196a07fb831185b8d42439b80c
 =

 This test is guarding against a defect I have almost introduced as part of
 fixing issue 1406. As noticed by Petr, for old-fashioned repositories the
 patches are written to files with names derived from the patch info that
 does not change with commutation. If invontory is updated tentatively but
 the actual patches not, than they can get out of sync and repository is
 broken. This test is one example scenario.
 =

] =

[Fix locale switching in emailformat.sh test
Reinier Lamers <tux_rocker@reinier.de>**20090906172308
 Ignore-this: b715f81d2f7d9e18c4ba55cafdf03c4
] =

[Remove home-grown UTF-8 decoder, use utf8-string instead
Reinier Lamers <tux_rocker@reinier.de>**20090823191033
 Ignore-this: 45f5d3e2d3efceba542a15b4905c7017
] =

[Fix a typo L=C3=A1szl=C3=B3 reported months ago.
Trent W. Buck <trentbuck@gmail.com>**20090913052903
 Ignore-this: ad628a3885ae87357c6ead5c22604b55
] =

[Improve performance of clean_hashed (by a factor of ~n/logn).
Petr Rockai <me@mornfall.net>**20090811105205
 Ignore-this: 99857732fd41d031eca4df44e47d23ee
 =

 On the scale of 50k files + 50k garbage, clean_hashes was basically useles=
s
 (before: gave up waiting after 20 minutes, after: 35 seconds). (This happe=
ns
 when running darcs optimize --pristine on a 50k-big repository.)
] =

[Split tags/TAGS target.
Eric Kow <kowey@darcs.net>**20090911204436
 Ignore-this: 84eb9b006aaed82bfd94be59b001cbee
 The previous combined target does not appear to generate tag files that
 vim can recognise.
] =

[Test for issue1224
Thorkil Naur <naur@post11.tele.dk>**20090911170850
 Attempting to "darcs convert" a repository which is already in darcs2 form=
at
 leads to a converted repository with missing file contents. This patch
 provides a test that reproduces this behaviour.
] =

[Accept issue1300: --delete-file should only delete if test succeeds.
Eric Kow <kowey@darcs.net>**20090907112620
 Ignore-this: 5a62e769b72808c9827675b2de2e6dae
] =

[Accept issue1332: darcs add -r seems to ignore --boring.
Eric Kow <kowey@darcs.net>**20090907110432
 Ignore-this: e154f5d8fb9e196a87c499c94cb33309
] =

[Test for issue942.
Eric Kow <kowey@darcs.net>**20090907105201
 Ignore-this: 2fa9be77fc31cc4958970fc09a88027f
 =

 It appears to have been resolved by:
 Thu Oct 30 18:55:08 CET 2008  David Roundy <droundy@darcs.net>
   * make default be to --run-posthook and --run-prehook
] =

[Test for issue142.
Eric Kow <kowey@darcs.net>**20090904173849
 Ignore-this: 29fe1f32341d62b2582b601ca699e8a9
] =

[Subsections for posthooks and prehooks.
Eric Kow <kowey@darcs.net>**20090902072253
 Ignore-this: 85402c1fd51c99cb45e20eb0442abf53
] =

[Remove darcs.cgi contrib script.
Eric Kow <kowey@darcs.net>**20090909192413
 Ignore-this: 919bf120a9cf0256036598309a44b5e3
 Will Glozer can no longer maintain it.
] =

[More descriptive name for issue1488 test.
Eric Kow <kowey@darcs.net>**20090909192238
 Ignore-this: 6bc0dddf87b12f0b269110ae5d29796d
] =

[Accept issue1488: a 'fromJust error' in 'darcs whatsnew -l'
Marnix Klooster <marnix.klooster@gmail.com>**20090909180046
 Ignore-this: d064a42a78efef5c327d41e425a6fefc
] =

[Make the ./tests/issue1465_ortryrunning.sh a little more foolproof.
Petr Rockai <me@mornfall.net>**20090909144349
 Ignore-this: 2e0f7370f2e53e3c104e68a9c5aeeafe
] =

[Skip the time-stamps test on windows.
Petr Rockai <me@mornfall.net>**20090909142844
 Ignore-this: 72b0bc3d549cab38bceda55113334dd
] =

[make an assumption in the pull code explicit
Ganesh Sittampalam <ganesh@earth.li>**20090908214917
 Ignore-this: c573c45fb13012ebd28022f44508d6c8
 It seems like get_common_and_uncommon always returns a singleton list,
 which is then relied on later. This patch makes that assumption explicit,
 by erroring out if it's not true.
] =

[Print expansions of simple commands in testsuite output.
Petr Rockai <me@mornfall.net>**20090907072337
 Ignore-this: d78e78a155da6f30ebcc592780cfd699
 =

 This helps with debugging failures, since we see the exact command that wa=
s
 executed, after all shell expansion has been done. Moreover, we see exactl=
y
 which command failed -- the existing -v will eg. print a whole "if" statem=
ent
 with body and it cannot be discerned which branch was taken or which comma=
nd
 exactly has failed.
] =

[Use the correct slash in push-formerly-pl.
Petr Rockai <me@mornfall.net>**20090906131345
 Ignore-this: b2fe686adcdccbcaf58ca839c19634c9
 =

 This is usually not required, but in this particular case, the bad slash
 confuses darcs path comparison (it keeps around the mixed slashes in one o=
f the
 paths, but has backslashes-only in the other one and wrongly concludes tha=
t the
 paths are different).
] =

[Exit 200 in abort_windows to indicate the skip to the harness.
Petr Rockai <me@mornfall.net>**20090906131236
 Ignore-this: 18c60417b1c986eebbfddba896738ddb
] =

[Add a simple testcase for the --external-merge option.
Petr Rockai <me@mornfall.net>**20090806063953
 Ignore-this: e848f9b8d5d926fbcc05064d85c49316
] =

[Add a rudimentary release script.
Petr Rockai <me@mornfall.net>**20090906154343
 Ignore-this: 7ace3f8e435b04258b270dcd094b9f13
 =

 This should automate most of the boring and (more importantly) error-prone=
 work
 that needs to be done upon a darcs release. Work in progress.
] =

[Avoid relying on /dev/stdin in tests/emailformat.sh.
Petr Rockai <me@mornfall.net>**20090903115749
 Ignore-this: 43b85a6dd1fcefeb7fd32628a5311a8c
] =

[More extensive haddocks on Darcs.Patch.Depends.get_extra.
Eric Kow <kowey@darcs.net>**20090905222525
 Ignore-this: c8e2ac70e5f61ea12afc479636d9e0cd
] =

[specify CPP globally for witnesses build
Ganesh Sittampalam <ganesh@earth.li>**20090829061922] =

[missing LANGUAGE in Darcs.ProgressPatches
Ganesh Sittampalam <ganesh@earth.li>**20090829061256] =

[missing LANGUAGE in Darcs.Commands.Unrevert
Ganesh Sittampalam <ganesh@earth.li>**20090829061208] =

[remove some derived classes from Tag
Ganesh Sittampalam <ganesh@earth.li>**20090727060203
 Ignore-this: 933bd408aff78744925ec2e6cb2475ce
 This helps to make the representation more abstract
 =

] =

[couple of GADT build fixes for recent GHCs
Ganesh Sittampalam <ganesh@earth.li>**20090803050514
 Ignore-this: 6c20e60426da722d0119e00be4eb6816
] =

[add a comment
Ganesh Sittampalam <ganesh@earth.li>**20090803055736
 Ignore-this: aad4e733fede7c8abe552893159e0fef
] =

[minor clean up in TouchesFiles
Jason Dagit <dagit@codersbase.com>**20090830080712
 Ignore-this: dd23aa84c47234c72f14948981214960
] =

[silence a warning that happens when compiling witnesses
Jason Dagit <dagit@codersbase.com>**20090830022548
 Ignore-this: 58f61bce80505de12ede5095d209b577
] =

[remove unused argument to readPrim
Jason Dagit <dagit@codersbase.com>**20090830022354
 Ignore-this: df9164c70fa9be8f274bdb8e634956d1
] =

[use gzipFormat instead of GZip to work around deprecation warning.
Jason Dagit <dagit@codersbase.com>**20090830022209
 Ignore-this: a556704bf2c974c10619a8051ebb90b4
] =

[Resolve issue1578: Don't put newlines in the Haskeline prompts.
Judah Jacobson <judah.jacobson@gmail.com>**20090829072733
 Ignore-this: 48a17fb0f45f3aee76aa56361bfd97df
 =

 Haskeline doesn't expect to get control characters in its prompt.
 The fix is to manually print all but the last line of a prompt message
 separately, and then pass the last line as the Haskeline prompt.
 =

 So far we've only seen this cause a problem when mark-conflicts is run in
 the emacs shell (see the issue for more information).
] =

[Whoops, one more obviated line from Darcs.Repository.Checkpoint.
Trent W. Buck <trentbuck@gmail.com>**20090829070738
 Ignore-this: b9aef33a8b34db9d41f8d0b83025c85b
] =

[Resolve issue1548: show contents requires at least one argument.
Trent W. Buck <trentbuck@gmail.com>**20090829073643
 Ignore-this: c15286919e827a5e7fdad01c75acccfe
] =

[Add a hidden alias "darcs log" for "darcs changes".
Trent W. Buck <trentbuck@gmail.com>**20090829032545
 Ignore-this: 96d8bec96c5bf39387a534fa62a79e28
 Reduces disparity with CVS, svn, hg, git &c, who all use "log".
] =

[Mark issue68 test as failing (and fix issue number).
Eric Kow <kowey@darcs.net>**20090828101717
 Ignore-this: 63c0ba22d171cefe5a0244b4ee57a991
] =

[Remove unused code from Darcs.Repository.Checkpoint.
Trent W. Buck <trentbuck@gmail.com>**20090828030127
 Ignore-this: 25ab977e5ac0b735ca6ee90aea0349c9
] =

[The record-scaling test still fails.
Trent W. Buck <trentbuck@gmail.com>**20090828025648
 Ignore-this: 5ca16bd011676b083cdfcd4359f4744a
] =

[Print helpful message in gzcrcs command when visiting other repos
Ganesh Sittampalam <ganesh@earth.li>**20090827054315
 Ignore-this: a7f997c441f0e246c4d31d827ebc9d2b
] =

[Clean up leftover conflicts from merge with David's test suite work.
Eric Kow <kowey@darcs.net>**20090824104840
 Ignore-this: ec4ef00d4c5b4da6e24f008f854da2e8
] =

[Resolve conflicts between David and mainline test suite work.
Eric Kow <kowey@darcs.net>**20090815232335
 Ignore-this: 72f386bd5345c344f32ca2db9f5594e3
 =

 Patches involved from David's end:
   * add failing test demonstrating nasty conflict markings.
   * mark check.sh test as passing.
   * mark issue27 test as passing.
   * mark issue 1043 test as passing.
   * mark nfs-failure.sh as passing (even though it might not be fixed).
   * mark dist-v as passing.
   * mark check.sh as failing.
   * clean up and mark as passing the broken-pipe.sh test.
   * mark issue 525 is no longer failing.
   * move bugs into tests/ directory.
 =

 The main patch involved is the 'move bugs into tests/ directory'
 which conflicts with some new bugs we added.  I re-added these
 manually from the mainline branch of darcs along with some bugs
 we added that we later marked as passing.
 =

 I also had to clean up a few tests along the way:
 - check.sh because of conflicts,
 - broken-pipe.sh because of temp dir garbage and
 - record-scaling.sh because of MacOS X incompatiblity
] =

[add failing test demonstrating nasty conflict markings.
David Roundy <droundy@darcs.net>**20090329022150
 Ignore-this: 17b0df1e2a33e5efccd92f1930850c15fbf12b1e
] =

[mark check.sh test as passing.
David Roundy <droundy@darcs.net>**20081207192451
 Ignore-this: bb0d26124eb69bb88e981d06caa88206
] =

[mark issue27 test as passing.
David Roundy <droundy@darcs.net>**20081201170526
 Ignore-this: 49c7b75f79d9bf25610162d079f7dde9
] =

[mark issue 1043 test as passing.
David Roundy <droundy@darcs.net>**20081119150515
 Ignore-this: 8b46c9feb0680f0ee9b4f95ee93eb580
] =

[mark nfs-failure.sh as passing (even though it might not be fixed).
David Roundy <droundy@darcs.net>**20081117160036
 Ignore-this: d13ebd26c2a799668068132f9c4d05bc
] =

[mark dist-v as passing.
David Roundy <droundy@darcs.net>**20081115221319
 Ignore-this: 6fbea237af32801e7207f25af032f408
] =

[mark check.sh as failing.
David Roundy <droundy@darcs.net>**20081115220504
 Ignore-this: 812ad08924c9d713646c7adc26d34b75
] =

[clean up and mark as passing the broken-pipe.sh test.
David Roundy <droundy@darcs.net>**20081115213750
 Ignore-this: db9fb0de61a4099c73e42365047dc9d2
] =

[mark issue 525 is no longer failing.
David Roundy <droundy@darcs.net>**20081115212158
 Ignore-this: 8398c09d03c2e900251f46c41106d94
] =

[move bugs into tests/ directory.
David Roundy <droundy@darcs.net>**20081115205509
 Ignore-this: 6b249e3ba90b455331ba31fee36ef5ad
] =

[update docs for darcs mv to reflect reality
Ganesh Sittampalam <ganesh@earth.li>**20090827230453
 Ignore-this: 7f5c30b5711b8bbcbec47f6217662b0d
] =

[Mark issue1317 test as failing (and note issue number).
Eric Kow <kowey@darcs.net>**20090824110437
 Ignore-this: bbecb8d3a4e60c3bc96b28b729375b6c
] =

[Regression test for issue1317.
Marco T=C3=BAlio Gontijo e Silva <marcot@riseup.net>**20090811220616
 Ignore-this: 846d37873b06a70bed87afeb0fbf2d38
] =

[Explain a slightly obtuse one-liner.
Trent W. Buck <trentbuck@gmail.com>**20090824033200
 Ignore-this: 8d6ed336b0a2d932eed879fc85183943
] =

[Support tests/failing-foo.sh convention for bugs.
Eric Kow <kowey@darcs.net>**20090814103659
 Ignore-this: 4729f6553910660be921af7d1199abb1
] =

[Minor style tweaks in cabal test.
Eric Kow <kowey@darcs.net>**20090814102234
 Ignore-this: 9ce3479022f3c177af3c4fa17426b177
] =

[Support command line arguments in PAGER or DARCS_PAGER
joe@elem.com**20090823011449
 Ignore-this: d979af618b5f193b58867e43dd2e0171
 For example:
   PAGER=3D"less -is" darcs help
] =

[Rename xml_summary to xmlSummary and summarize to plainSummary.
Eric Kow <kowey@darcs.net>**20090818220119
 Ignore-this: b1e29f45f0599a406ffb6496acac2488
] =

[Cut unused imports in Darcs.Patch.Viewing.
Eric Kow <kowey@darcs.net>**20090818214432
 Ignore-this: f83f5ce55279a5b96a14770dbcb7dd0b
] =

[Simpler types for changes --summary.
Eric Kow <kowey@darcs.net>**20090818213946
 Ignore-this: 22fdc7984753eedf3d35ff88762a2eb2
] =

[Camel-case some Darcs.Patch.Viewing functions.
Eric Kow <kowey@darcs.net>**20090817153751
 Ignore-this: b3b03f3408f1097e5b476a35215ecec6
] =

[A tiny bit more separation of concerns in changes --summary core.
Eric Kow <kowey@darcs.net>**20090817230414
 Ignore-this: b9f5e9625862d19c356667dc2ce6710d
] =

[Resolve issue183: Do not sort changes --summary output.
Eric Kow <kowey@darcs.net>**20090817225814
 Ignore-this: 2749e08a69592f49bb7e2400ae89e8a6
 This adds move patches to our high-level representation of summary output.
] =

[Refactor changes --summary core code.
Eric Kow <kowey@darcs.net>**20090817225735
 Ignore-this: 1078c3bf42fa5e2acef6e6a31c81c42b
 =

 This uses some custom types representing summarised changes on a higher le=
vel
 and also moves the XML and 'line' based rendering of summaries into separa=
te
 blocks of code.
] =

[Accept issue1472: "darcs record ./foo" shouldn't open ./bar.
Trent W. Buck <trentbuck@gmail.com>**20090815084306
 Ignore-this: 23d5392008872369ba9b509b75aeb5bc
 This bug was present in Darcs 2.0, but gone by 2.3.
 Thus, this patch simply adds a regression test.
] =

[Remove tabs from src/Exec.hs
Reinier Lamers <tux_rocker@reinier.de>**20090809163015
 Ignore-this: 30952fddf0ae0f60b3af442e90411ca7
] =

[Remove optimize --checkpoint cruft.
Eric Kow <kowey@darcs.net>**20090811143734
 Ignore-this: c36c818704171289ff388cdd539626d5
] =

[darcs.cabal turn on -fwarn-tabs per dupree
gwern0@gmail.com**20090807013047
 Ignore-this: c7961b5512d2f8392f3484c81ca197e0
] =

[Add script that tricks cabal into installing our build-depends only.
Petr Rockai <me@mornfall.net>**20090805152653
 Ignore-this: 6a70f5ff464d26a944b81967606e7af0
] =

[Update hpc.README to use Cabal.
Petr Rockai <me@mornfall.net>**20090730190304
 Ignore-this: 7f63751a7daa418ffdca2ca6d20af1b1
] =

[Add a flag for enabling HPC for the darcs library.
Petr Rockai <me@mornfall.net>**20090730185959
 Ignore-this: e0246133e84e8547e223f61b67a28066
] =

[Combine the HPC tix files after each test in ShellHarness.
Petr Rockai <me@mornfall.net>**20090730185951
 Ignore-this: 577a6e1614aa8c5ff6f25d9df6f81554
 =

 This is done when HPCTIXDIR is set, so presumably we are generating covera=
ge
 report. We need to do this, because otherwise, a full testsuite run produc=
es
 over a gigabyte of tixfiles, even though the combined tix is less than 200=
K.
] =

[Require haskell zlib, dropping the legacy internal zlib binding.
Petr Rockai <me@mornfall.net>**20090722091325
 Ignore-this: 348c1fd005fe19900e4a9706567b4ee0
] =

[Fix link to autoconf tarball.
Eric Kow <kowey@darcs.net>**20090723135420
 Ignore-this: cfe87256fbd5af286a00fbb84ca443d0
] =

[Update web page for 2.3.0 release.
Eric Kow <kowey@darcs.net>**20090723134705
 Ignore-this: dfa04b99e5c0170448d635bf0e496a66
] =

[Makefile: fix dependency on no longer existing distclean target.
Eric Kow <kowey@darcs.net>**20090722093438
 Ignore-this: d0f8da797e26b0c42a2da76eddd4ed31
] =

[Make utf8-string mandatory.
Eric Kow <kowey@darcs.net>**20090721194433
 Ignore-this: cd8a94b3e4e41bb938e82dffbcb27e2d
] =

[Remove UTF8 module completely.
Eric Kow <kowey@darcs.net>**20090721194220
 Ignore-this: f4ec3fe853ecbc928a8d3e3c3b9aa07c
 The utf8-string package has been the default for a while.
 Now we're wholly dependent on it.
] =

[Add support for skipping tests (exit 200).
Petr Rockai <me@mornfall.net>**20090720095346
 Ignore-this: 133cb02e8cca03a4678068450cb150a9
] =

[Remove the --checkpoint option from the UI.
Petr Rockai <me@mornfall.net>**20090720093634
 Ignore-this: 2fb627cd1e64bbe264fda6e19f0b085b
] =

[Remove the support for writing out new checkpoints.
Petr Rockai <me@mornfall.net>**20090720091809
 Ignore-this: 87eb23fe7604ed0abe5c38daafb87a7e
] =

[Remove unused determine_release_state.pl.
Eric Kow <kowey@darcs.net>**20090721205227
 Ignore-this: 15331bbb258fbdeb6bd4887c8dabb8ed
] =

[Remove ununsed test/shell_harness.hs.
Eric Kow <kowey@darcs.net>**20090721192027
 Ignore-this: 7efbe97744c698beecd4f17a09868467
] =

[Slightly refactor the run function in ShellHarness.
Petr Rockai <me@mornfall.net>**20090714134205
 Ignore-this: 92c7f05b9c4d6973e95706f23ea27dfc
] =

[Slightly refactor test machinery in Setup.lhs.
Petr Rockai <me@mornfall.net>**20090714134119
 Ignore-this: 32206a331658d407d9c0fb3b48405db6
] =

[Use tee in pending_has_conflicts.sh for easier debugging.
Petr Rockai <me@mornfall.net>**20090713180404
 Ignore-this: 7b96b7f7df6358ddb0466cfe58803f71
] =

[Roll back the getSymbolicLinkStatus workaround, since it constitutes a fd =
leak.
Petr Rockai <me@mornfall.net>**20090710143149
 Ignore-this: cd2aa7e13cc902852a7c5d0855d55538
 =

 rolling back:
 =

 Sun Jun 21 17:39:42 CEST 2009  Petr Rockai <me@mornfall.net>
   * Avoid getSymbolicLinkStatus in mmap implementation, works around GHC 6=
.8.2 bug.
] =

[Note darcs 2.3 pre-release and darcs 2.2 stable versions in website.
Eric Kow <kowey@darcs.net>**20090716133323
 Ignore-this: bbe9c36213a07890816b8599f2f29aee
] =

[Rename index.html.in to index.html, forgoing website automation.
Eric Kow <kowey@darcs.net>**20090716133023
 Ignore-this: a4c62db2d3ca341e95262cd05328473f
 =

 The website automation allowed us to avoid duplication of information (ie.
 version numbers), but we're in the process of changing our build and
 release system, which breaks the site.  For now, we go for simplicity and
 robustness, perhaps restoring the automation in the future when things
 have settled down somewhat.
] =

[Remove bytestring flag from darcs.cabal.
Eric Kow <kowey@darcs.net>**20090714165021
 Ignore-this: 4325773231f9679054c7d045657bdae0
 Now that we're requiring GHC 6.8 or above, we always use the external byte=
string
 package.
] =

[Move email unit tests to Darcs.Test module space
Reinier Lamers <tux_rocker@reinier.de>**20090629203409
 Ignore-this: 3187d24822e7a125a46e0a273956d792
] =

[Teach cabal about new Darcs.Test modules
Reinier Lamers <tux_rocker@reinier.de>**20090629193208
 Ignore-this: c27c8398fd637e100259fdf1f4d42e0a
] =

[Move unit tests to Darcs.Test module space
Reinier Lamers <tux_rocker@reinier.de>**20090629192934
 Ignore-this: e88d9ecb7ca8f0b5679fba2cd2813ff0
] =

[Bound size of trees generated in Darcs.Patch.QuickCheck
Reinier Lamers <tux_rocker@reinier.de>**20090628134952
 Ignore-this: c499b850ad5ca15d4bada56b69ee98f3
 =

 This keeps the 'Checking that tree flattenings are consistent' test from
 occasionally taking hours and hours to complete. The maximum depth of 5 wa=
s
 found by experiment.
] =

[Add some comments in Darcs.Patch.QuickCheck
Reinier Lamers <tux_rocker@reinier.de>**20090628134908
 Ignore-this: c66a386865832e75427f99febfb91a91
] =

[Avoid getSymbolicLinkStatus in mmap implementation, works around GHC 6.8.2=
 bug.
Petr Rockai <me@mornfall.net>**20090621153942
 Ignore-this: 91092453d97c87edfc4e46b11e4ae208
] =

[TAG 2.3.1
Reinier Lamers <tux_rocker@reinier.de>**20090920174331
 Ignore-this: a5da37b9925e1dfe3e81f0b67183ef1f
] =

Patch bundle hash:
506abb30434c45fc849c053b23ccd05a3c606bdc

--=_--

.

Attachments

• unnamed

I push'd those to HEAD, but since the bundle was malformatted 
(darcs/windows problem) darcswatch probably failed to notice.