[darcs-devel] [patch717] Test script against issue 2138

[Lele Gaifax]

New submission from Lele Gaifax <lelegaifax at gmail.com>:

1 patch for repository http://darcs.net/screened:

Fri Feb  3 22:31:31 CET 2012  lele at metapensiero.it
  * Test script against issue 2138, about whatsnew --summary not reporting conflicts

New patches:

[Test script against issue 2138, about whatsnew --summary not reporting conflicts
lele at metapensiero.it**20120203213131
 Ignore-this: 6c580e8b212678745147e57c657d383f
] addfile ./tests/whatsnew-s.sh
hunk ./tests/whatsnew-s.sh 1
+#!/usr/bin/env bash
+## Test for issue2138 - whatsnew --summary does not show conflicts
+##
+## Copyright (C) 2012 Lele Gaifax
+##
+## 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.
+
+rm -rf R S
+
+darcs init --repo R
+
+cd R
+echo 'Example content.' > f
+darcs record -lam 'Add f'
+cd ..
+
+darcs get R S
+
+# Create a deliberate conflict
+cd R
+echo "Conflict on side R" >> f
+darcs record -am 'CR'
+
+cd ../S
+echo "Conflict on side S" >> f
+darcs record -am 'CS'
+
+darcs pull -a ../R
+
+darcs whatsnew > out
+cat out
+grep "side R" out | wc -l | grep 1
+grep "side S" out | wc -l | grep 1
+
+darcs whatsnew --summary > out
+grep "^M!" out | wc -l | grep 1
+
+cd ..
+rm -rf R S

Context:

[Haddock-friendly formatting for Darcs.Patch.Apply
Will Langstroth <will at langstroth.com>**20120131044639
 Ignore-this: 9568039da7aab1ac745313ef6e7f67ec
] 
[Readability tweaks for Darcs.Flags
Will Langstroth <will at langstroth.com>**20120131032424
 Ignore-this: 70f2f69630b21db073d96a42275ee889
] 
[More readability tweaks for Data.Ssh
Will Langstroth <will at langstroth.com>**20120131033737
 Ignore-this: dce2b62bb748ae14232bce30b4e09acb
] 
[Readability tweaks for Darcs.Ssh
Will Langstroth <will at langstroth.com>**20120131033537
 Ignore-this: c99070d3cdb858b8a3dbfdaf5a9e83d4
] 
[Haddock header and module clean-up for Darcs.Ssh
Will Langstroth <will at langstroth.com>**20120131033440
 Ignore-this: d143e8716f9c94f72a8c1f96766b9e17
] 
[Pull getDistName out of IO
Andreas Brandt <andreas.brandt.de at googlemail.com>**20120130222731
 Ignore-this: 22096cfe0d5fd911d9d0a19c6bbe4d91
] 
[Removed unnecessary whitespace/comment
Andreas Brandt <andreas.brandt.de at googlemail.com>**20120130221044
 Ignore-this: 643af29b01b545ea172c9518aa38082f
] 
[Fix import of System.FilePath
Andreas Brandt <andreas.brandt.de at googlemail.com>**20120130220455
 Ignore-this: ebf52f1c3f1ab7e31498c71198eeb246
 To quote the documentation of System.FilePath.Posix:
 "Importing System.FilePath is usually better."
] 
[Refactor: Use takeFileName instead of own function
Andreas Brandt <andreas.brandt.de at googlemail.com>**20120130220325
 Ignore-this: ee4cf95361c6987c213cf7fa004d9240
 Since getCurrentDirectory always gives an absolute path the check for '/'
 is not necessary and takeFileName can do the job.
] 
[Refactor: Use list comprehension instead of recursion
Andreas Brandt <andreas.brandt.de at googlemail.com>**20120130212311
 Ignore-this: 59c9b34df0aaace3181899fa2465c36e
] 
[Fix improper handling of FileNames that are prefixes-of, but not parents-of a target FileName.
Owen Stephens <darcs at owenstephens.co.uk>**20120131003610
 Ignore-this: 7bc9399785fbb9718f393abdd2fc1d25
] 
[Readability tweaks to Workaround
Will Langstroth <will at langstroth.com>**20120130115228
 Ignore-this: 5fc28707cddf9efbca47e0b8672eb013
 Mostly to make the file easier for Haddock to deal with.
] 
[Format export in Ratified
Will Langstroth <will at langstroth.com>**20120130115104
 Ignore-this: 50085264074edfa41c2e8fdabdb1a33c
 Also a note for further documentation, as there are two exports and one explicit
 import.
] 
[Readability tweaks on Darcs.Diff
Will Langstroth <will at langstroth.com>**20120129045817
 Ignore-this: 62c3f694271b7e453e7d550de03a7198
] 
[Readability tweaks to Progress
Will Langstroth <will at langstroth.com>**20120129041534
 Ignore-this: 868c5a2ff51c65b2a49e892dab0e05f9
] 
[Readability changes to Darcs.Annotate
Will Langstroth <will at langstroth.com>**20120128132615
 Ignore-this: cf4d540b6c9f37103ea3e0666c5ec3f1
] 
[Add Haddock header to Darcs.Annotate
Will Langstroth <will at langstroth.com>**20120126030855
 Ignore-this: 30e7d311b18cd6a1529c86138f96573e
] 
[Haddock headers
Will Langstroth <will at langstroth.com>**20120126023914
 Ignore-this: ebba325bc95f84048161544042e6a4b5
 Add Haddock headers to the files at the root of src/
] 
[Resolve issue2116: darcs dist --index no longer fails
andreas.brandt.de at googlemail.com**20120124200313
 Ignore-this: dbab4ca6457f922dd813e45ab803d75c
] 
[add some space, put escape type declaration next to function definition
Will Langstroth <will at langstroth.com>**20120124005229
 Ignore-this: acd6a7d1b096ace47413809f2df446a6
] 
[Add current_name attribute to created_as in changes --xml on multiple files.
Owen Stephens <darcs at owenstephens.co.uk>**20120124015721
 Ignore-this: e9f6b364a2cfe99c95e90a4cb22566db
 Without this attribute it wasn't necessarily clear which original name
 corresponded to which input filename.
] 
[Resolve Issue2136: Correctly track renames of multiple files in Changes --xml.
Owen Stephens <darcs at owenstephens.co.uk>**20120124013728
 Ignore-this: 4429aad5da83936189e05b4c6fddf9e9
 For each file passed to Changes, track its original name, and show the first
 patch that created it. Update lookTouch to track exactly which files are
 touched, and renames. Create utility function to provide old behaviour of just
 obtaining the effect of the patch on a filepath list.
] 
[Rename withFilePaths -> withFileNames, since it operates on FileNames not FilePaths.
Owen Stephens <darcs at owenstephens.co.uk>**20120124005741
 Ignore-this: 274f7aa55999c2840880fa8b22cf3ad3
] 
[Replace applyToFilepaths with applyToFilePaths to match casing of FilePath
Owen Stephens <darcs at owenstephens.co.uk>**20120124005108
 Ignore-this: ea153c27b196675ae7d6d4ca978439de
] 
[Add new helper function to determine if a given filename is the parentOrEqual of another.
Owen Stephens <darcs at owenstephens.co.uk>**20120124002308
 Ignore-this: 78713fff12b3ef619e69de0cf4ec9ab5
] 
[Use <$> instead of fmap in Patch/Apply.hs
Owen Stephens <darcs at owenstephens.co.uk>**20120124001506
 Ignore-this: dbda8ba1b84aedbf22f75528e3666632
] 
[Refactor movedirfilename to use stripPrefix lib function, rather than equivalent hand-rolled code.
Owen Stephens <darcs at owenstephens.co.uk>**20120124000908
 Ignore-this: 30d351c3f11e5d536396f44f6a23315c
] 
[Fixup failing tests due to record exiting with error when nothing to record.
Owen Stephens <darcs at owenstephens.co.uk>**20120123233118
 Ignore-this: b130aa8135e36f54d7ce5d5a869c3897
] 
[Fix amend-unrecord test, broken by last-regrets prompt
Owen Stephens <darcs at owenstephens.co.uk>**20120122153111
 Ignore-this: 245f259990f0cadfc6810f292f648d43
] 
[Make record respect quiet flag. If no changes to record, exit with failure.
Owen Stephens <darcs at owenstephens.co.uk>**20120122163605
 Ignore-this: 69ce30ded580c6fbeb72400bbfd4f423
] 
[Use Maybe to better express intent of potential error message when looking for file-specific changes
Owen Stephens <darcs at owenstephens.co.uk>**20120122041701
 Ignore-this: 676b58f17a59757d54a6e022c049dab6
] 
[Fix some compile warnings for Annotate
Owen Stephens <darcs at owenstephens.co.uk>**20120122040409
 Ignore-this: b2c7973f7666b9e806b369e4b357db14
] 
[Resolve issue2135: Don't keep trying to annotate a file, after processing the patch that added the file.
Owen Stephens <darcs at owenstephens.co.uk>**20120122041438
 Ignore-this: 7b74469cfef3d30181d2830a9cbb7171
] 
[--hide-successes option for test suite
Ganesh Sittampalam <ganesh at earth.li>**20120119225853
 Ignore-this: fbacbe9c3927d74d5c671d534f5ccc2b
] 
[resolve conflict in version number
Ganesh Sittampalam <ganesh at earth.li>**20120119225836
 Ignore-this: bcbc8d171159311a90505b35b2d2b51
] 
[TAG 2.9.1
Ganesh Sittampalam <ganesh at earth.li>**20120116075701
 Ignore-this: b2c75864401f272d691558c5ad5c840b
] 
[bump version to 2.9.1
Ganesh Sittampalam <ganesh at earth.li>**20120116075648
 Ignore-this: 15d676f8ab81f4f23a0a71deeabda165
] 
[add amend-unrecord alias
Ganesh Sittampalam <ganesh at earth.li>**20120115151839
 Ignore-this: 57af2f6dc60a2938860e3d68819fd2c8
] 
[TAG 2.7.98.3
Ganesh Sittampalam <ganesh at earth.li>**20120119060551
 Ignore-this: bc156878e2f54804226a43035ea5da28
] 
[change version to 2.7.98.3 (2.8 beta 3)
Ganesh Sittampalam <ganesh at earth.li>**20120119060530
 Ignore-this: f7c49633d3f23f247fa79c4bf0214814
] 
[clean out dist folder from sdist tarball
Ganesh Sittampalam <ganesh at earth.li>**20120119060458
 Ignore-this: ab0d7058410b73259e3a1a6d6eea9a4d
] 
[use cabal unpack instead of tar -x when testing
Ganesh Sittampalam <ganesh at earth.li>**20120119060419
 Ignore-this: 5cc2c22b6ee3e554b1a0c940b145fe9d
 This makes it more likely we'll catch problems that will hit users
] 
[TAG 2.7.98.2
Ganesh Sittampalam <ganesh at earth.li>**20120115220456
 Ignore-this: 604bbc2c5ac21493b87708795b4c05ab
] 
[Change version to 2.7.98.2 (2.8 beta 2)
Ganesh Sittampalam <ganesh at earth.li>**20120115212221
 Ignore-this: 6e5dd76c3c5c86e3e17ea5836461ff0d
] 
[make website requires darcs for preprocessing
Ganesh Sittampalam <ganesh at earth.li>**20120105072033
 Ignore-this: 77e4389fafaf0a378452e0b10ed1f748
] 
[remove dead cabal flag from release script
Ganesh Sittampalam <ganesh at earth.li>**20120105072013
 Ignore-this: 7ef722d044d40dc6780824c5c8be49b6
] 
[add some missing files to darcs.cabal
Ganesh Sittampalam <ganesh at earth.li>**20120115210632
 Ignore-this: f97f93b3f4cfda89957e981ecacb87ed
] 
[resolve conflicts in darcs.cabal with test_stub.hs reinstatement
Ganesh Sittampalam <ganesh at earth.li>**20120115202444
 Ignore-this: 70bb687f5136a9e0b48fdd4e72bc0436
] 
[complete rollback of test_stub.hs removal for main branch
Ganesh Sittampalam <ganesh at earth.li>**20120105080917
 Ignore-this: 34d16d60691d1546c5ccc847a2387295
] 
[resolve conflicts in darcs.cabal with test_stub.hs removal
Ganesh Sittampalam <ganesh at earth.li>**20120115202244
 Ignore-this: 45cd2efd24bd9d82ba3547e050a85110
] 
[rollback removal of build-tools constraints
Ganesh Sittampalam <ganesh at earth.li>**20120105080248
 Ignore-this: 553689e57add975b0745d641de6a4364
] 
[TAG 2.7.98.1
Florent Becker <florent.becker at ens-lyon.org>**20110622133304
 Ignore-this: 34d700fca22914533895adec39aaea1e
] 
[Remove test_stub.hs since it freaks cabal sdist out :-(
Florent Becker <florent.becker at ens-lyon.org>**20110621084645
 Ignore-this: 13f57c2e2035b5f429195abecda6abf
] 
[Change version to 2.7.98.1 (2.8 beta 1)
Florent Becker <florent.becker at ens-lyon.org>**20110620125649
 Ignore-this: 3848c0eb0c2ae94d65766d81fdfa4680
] 
[fix harness.sh test on cygwin
Ganesh Sittampalam <ganesh at earth.li>**20111018181644
 Ignore-this: 293a4474821e4d5e61166e2483e6b971
] 
[fill out options for amend-record --unrecord and add test
Ganesh Sittampalam <ganesh at earth.li>**20120113233612
 Ignore-this: fd01f244cc9e4154d798fa76a286d0ee
  - interactive hunk edit
  - selecting files
] 
[rename amend-record's --rollback option to --unrecord
Ganesh Sittampalam <ganesh at earth.li>**20120109180946
 Ignore-this: 53ffad6e37499439946023d7e5415ba3
] 
[resolve issue1470: Allow to amend-record patch by removing some hunks
Johannes Weiss <weiss at tux4u.de>**20110814161209
 Ignore-this: 14ceecaf01af92bc54f86ca6cadf4548
] 
[make repair fix add of already existing things
Ganesh Sittampalam <ganesh at earth.li>**20120113070537
 Ignore-this: 5f52935f20a3f783e89339ed00968f03
 It seems tailor makes these by writing directly into pending
] 
[Recast patch property comments in Unicode.
Eric Kow <kowey at darcs.net>**20111231232709
 Ignore-this: 35b954c28c22f05ba5ae69ab98ac880f
 
 Originally from a draft patch by Trent Buck
   "DRAFT: Haddockize literate comments in Darcs.Patch.Properties."
 Haddock does not support Unicode characters unless they are escaped;
 however, the patch properties file in question has since moved to the
 test suite which is unlikely to be haddocked.
] 
[Drop SSH ControlMaster support.
Eric Kow <kowey at darcs.net>**20120101152135
 Ignore-this: e025640d51505e8215b6aa1e61c3f8d7
 
 At the time of this writing, I hope that darcs transfer-mode
 is widespread enough that people would just be using it rather
 than ControlMaster.
] 
[Resolve issue2090: correctly detect existing transfer-mode connection.
Eric Kow <kowey at darcs.net>**20120101235344
 Ignore-this: c392d370cd614c7a72be7d63f5d9da85
 The actual resolution is a dependency included with ask-deps.
] 
[Accept issue2090: darcs transfer-mode connection not shared. 
Eric Kow <kowey at darcs.net>**20120101235217
 Ignore-this: b8d45e347c18c1441fb85b9734ab9675
] 
[Move out useful lib code for ssh tests.
Eric Kow <kowey at darcs.net>**20120101233207
 Ignore-this: 3610fbdf81127cd7bd3f5c4517ef7e71
] 
[Update tests/network/ssh.sh to match last-regrets.
Eric Kow <kowey at darcs.net>**20120101232623
 Ignore-this: c26225a2c598f801187cc2770920c9a0
] 
[Fix some bitrot in tests/network/ssh.sh.
Eric Kow <kowey at darcs.net>**20120101232514
 Ignore-this: b820e2ccf6b7eae730f002749a42e7be
 It's still really meant to be run by hand, though.
] 
[turn packs off by default due to outstanding bugs
Ganesh Sittampalam <ganesh at earth.li>**20120101233129
 Ignore-this: ea1efd20d68beac01903425c24691ed9
] 
[Fix scp invocation.
Eric Kow <kowey at darcs.net>**20120101150856
 Ignore-this: ed2799935ad64a7ee03b1145163f9033
 
 Scp should be called if we cannot start darcs transfer-mode
 Since issue1970 (I think), we've been calling
   scp example.com example.com:file dest
 instead of
   scp example.com:file dest
 
 This patch restores the original behaviour
] 
[Remove Darcs.Ssh.runSSH (only used once).
Eric Kow <kowey at darcs.net>**20120101150803
 Ignore-this: 7b3f68fc165351efe40dd0a54e95fa5b
] 
[Resolve issue845: pass ssh stderr through.
Eric Kow <kowey at darcs.net>**20120101133058
 Ignore-this: 95fb98b084b3c09a360fa99e61099c25
 
 There does not seem to be any reason to hide it, as we are using
 the -q flag in pscp.
] 
[Move ssh verbosity settings to Darcs.Global.
Eric Kow <kowey at darcs.net>**20120101134147
 Ignore-this: 8b5860c9fed5c5b58e829ecca7a3dcd3
] 
[On Windows, prefer plink/pscp/psftp for ssh.
Eric Kow <kowey at darcs.net>**20120101133021
 Ignore-this: cdada3d89a892310362e31126a2bd04e
] 
[Flag that reports if we are on a Windows box.
Eric Kow <kowey at darcs.net>**20120101122834
 Ignore-this: 96a07104e0d7aafcca912f1ff988387b
] 
[Move ssh command detection to Global.
Eric Kow <kowey at darcs.net>**20120101121938
 Ignore-this: df5203e0d5bf214a7b80063ac3e75ab2
 The idea is to have ssh settings detection run once.
] 
[Rename Ssh to Darcs.Ssh
Eric Kow <kowey at darcs.net>**20120101110340
 Ignore-this: d67320962d6e42baea79685b29e74e4a
 
 It seems unrealistic to hope that our ssh code can stand alone, what with darcs
 transfer-mode and all.
] 
[Improve debugging messanges for darcs transfer-mode
Eric Kow <kowey at darcs.net>**20120101143123
 Ignore-this: 914f0a81ea45d46d6588f76a08f8b6e8
] 
[Fix ssh performance regression.
Eric Kow <kowey at darcs.net>**20120101142726
 Ignore-this: 4896ab77af6269de094945002098e9d
 
 We weren't correctly deciding when to use connection sharing.
 We were looking at the full path instead of just the host to
 determine if we should re-use a connection or not.
 
 This seems to have been introduced by the issue1970 patch.
] 
[Refactor darcs help environment and make it support multiple args.
Eric Kow <kowey at darcs.net>**20120101101641
 Ignore-this: 855b789e91c555744f94d73be9f8ee74
] 
[make monad pipeline explicit
thomashartman1 at gmail.com**20100102174548
 Ignore-this: 8f10d4403232fc96f55834833736403c
] 
[Expose a Darcs.Commands.ShowFiles.manifest for Darcs API users.
Eric Kow <kowey at darcs.net>**20120101002218
 Ignore-this: cb50367871674af16a798684a89656b8
 
 Inspired by patches by Thomas Hartmann on Jan 2010, but using a slightly
 different function name "manifest" from Thomas' "filesAndDirsCmd".
] 
[More readable helper functions in Darcs.Commands.ShowFiles.
Eric Kow <kowey at darcs.net>**20120101002215
 Ignore-this: 36f84a95ee6b136fe729d9623bd6f8be
 Originally from patches submitted by Thomas Hartman in Jan 2010
] 
[use a flag to choose base>=4.4
Ganesh Sittampalam <ganesh at earth.li>**20111231193005
 Ignore-this: 87b791c497b95c23a72a4d94447d644d
] 
[GHC 7.4 build fix
Ganesh Sittampalam <ganesh at earth.li>**20111229235840
 Ignore-this: b0d4777aba86d9b164e93ae104c0cc80
] 
[bump dep on process
Ganesh Sittampalam <ganesh at earth.li>**20111229235825
 Ignore-this: e70c4cf6df0e9502757c3f5f26a451ac
] 
[Mark issue1819 test as failing and extend it a tiny bit.
Eric Kow <kowey at darcs.net>**20111231191757
 Ignore-this: bdf0ad0b5ffd912b2ee536bcd6e4a6f0
 Also use test suite idioms (eg. set -ev) for ease of understanding.
] 
[Accept issue1819: pull --dont-allow-conflicts doesn't work
Dave Love <fx at gnu.org>**20100418123627
 Ignore-this: e55facd2179b93bf1b668e862affa8dc
] 
[Add optional specifier for "darcs help environment [VARIABLE]".
Trent W. Buck <trentbuck at gmail.com>**20090628121017
 Ignore-this: 73de3e4bfc036694f9ca4506a2014470
 This kind of command-line argument parsing seems like a huge bodge.
 Surely there is a better way to write this, maybe with getopt?
] 
[Slap a copyright header on the index argument test.
Eric Kow <kowey at darcs.net>**20111231165213
 Ignore-this: e4396ae2a560189a6bae9bf8c3a0da37
] 
[test that send reports UTF-8 encoding when needed
Ganesh Sittampalam <ganesh at earth.li>**20111229202449
 Ignore-this: 677d25e23d41cd65a11e19d1daff2dfd
] 
[Rename --index tests to be a bit more specific.
Eric Kow <kowey at darcs.net>**20111229131914
 Ignore-this: e64f46f9419d96a9402d1c0c68bf34d2
] 
[Test case for argument handling
andreas.brandt.de at googlemail.com**20111228230905
 Ignore-this: 75b3b6aa6da371cd8d183a31851419d5
 This script currently tests if the --index option is recognized by every command that should support it.
 The long term plan is to test all commands with all supported options here.
] 
[Resolve issue1705: show contents --index fixed by Owen.
Eric Kow <kowey at darcs.net>**20111229131537
 Ignore-this: 2a28f473146fe1d0d93db6baeda9c8ef
 
 I'm guesssing this is the fix:
 Wed Jun 29 12:57:16 BST 2011  Owen Stephens <darcs at owenstephens.co.uk>
   * Fix error with unhandled --index in show contents
] 
[Accept issue1705: test show contents --index=1
Eric Kow <kowey at darcs.net>**20111229131423
 Ignore-this: f7413426c9253c7af79dc82577d9f9a3
 This test was submitted by Thomas Hartman
] 
[Last regrets spelling and capitalisation tweak.
Eric Kow <kowey at darcs.net>**20111229124045
 Ignore-this: 26a54dd1553065bd0f6602a7a48d3e21
] 
[Update tests to work with last regrets prompt.
Eric Kow <kowey at darcs.net>**20111229123657
 Ignore-this: d0cc9fe993640a8f45453b5c1ff304a9
 
 Along the way:
 - Dump inconsistently used and thus not needed 'newline after prompt' behaviour
 - Use convention of capital letters to mark last regrets prompt when we have
   multi-phase UI (eg. ask-deps, rollback)
] 
[Don't ask confirmation if there are no things to select in textSelect
Florent Becker <florent.becker at ens-lyon.org>**20110615091607
 Ignore-this: 894a5691a93bd228a55b663e418f9e65
] 
[remove double confirmation in revert
Florent Becker <florent.becker at ens-lyon.org>**20110615090003
 Ignore-this: 2d2c3337b8465267c6a1740e401afe14
] 
[Add a last question after all patches have been selected to confirm the whole selection
Florent Becker <florent.becker at ens-lyon.org>**20110615084241
 Ignore-this: 35b64f97d877c4ab971101299ef6c226
] 
[add test for 'k' in amend-record
Ganesh Sittampalam <ganesh at earth.li>**20111229021928
 Ignore-this: 4ede8460c543e8213916e1d026caa8b7
] 
[improve variable name
ganesh at earth.li**20111228221934
 Ignore-this: 8eee19f737f9ddc7a39c4642ae46912
] 
[Use Data.List prefix functions for checking urls/targets in Send.
Owen Stephens <darcs at owenstephens.co.uk>**20111228172754
 Ignore-this: 2de8663ef3cbced74f1624a2eb8c694d
] 
[Extract function to generate email "to" string in Send, removing some duplicated code.
Owen Stephens <darcs at owenstephens.co.uk>**20111228165247
 Ignore-this: defbaf1c926153d9f406588c422c3607
] 
[Remove Hlint and compiler warnings from Send.
Owen Stephens <darcs at owenstephens.co.uk>**20111228164855
 Ignore-this: aee4423bef60b7fdf66dd825fb512abd
] 
[use shorter name for ScanAllWithBoring and document ScanKnown
Ganesh Sittampalam <ganesh at earth.li>**20111227215003
 Ignore-this: 7d57f2c43b5a17ff2e3cab9420ae7696
] 
[use string comparison instead of a regex to check for _darcs
Ganesh Sittampalam <ganesh at earth.li>**20111227214802
 Ignore-this: 581317b1978d80174ba5d1d6d077bc5f
] 
[resolve issue1332: issue2054 was a dupe of this issue
ganesh at earth.li**20111227213023
 Ignore-this: 295a2c46f5d3179e429ad678e35fc541
] 
[ghc 7.4.1-rc1 build
Mark Wright <gienah at gentoo.org>**20111224003333
 Ignore-this: d7ea90156b835b169f00f5be9b8c88b0
] 
[relax HTTP dependency
Mark Wright <gienah at gentoo.org>**20111224002302
 Ignore-this: b790877df8798661ce75662124934c49
] 
[Make the running of tests more entertaining 3rd edition
naur at post11.tele.dk**20111018102348
 Ignore-this: 80e99c3a031141f78c844a699fe07290
] 
[Accept issue2100: darcs add should move on from first failure.
Eric Kow <kowey at darcs.net>**20110907165915
 Ignore-this: 8afc08507be9bd7550e87e4f87e870c8
] 
[Fix typo in Move error message.
Owen Stephens <darcs at owenstephens.co.uk>**20110831130033
 Ignore-this: 1aa06f4a503801fdd83872eae9bd7f29
] 
[resolve issue2098: darcs dist -q is not quiet
andreas.brandt.de at googlemail.com**20111219231638
 Ignore-this: faa59c82a936c5abdacd1769d909ff69
] 
[hlint refactoring
andreas.brandt.de at googlemail.com**20111219221458
 Ignore-this: 526b45e45e1697adf1298f52970e50d1
] 
[Prepare trackdown-bisect-helper.hs for GHC 7.2 (haskell98 and random)
naur at post11.tele.dk**20111018103631
 Ignore-this: 3e440024f8fdb60af0e25c967642cd59
 In GHC 7.2, the haskell98 package has become hidden by default and the
 random package is no longer included. Some imports therefore need to be
 more specific. And Random turned out to be unused.
] 
[Bump unix dependency for ghc-7.2.1 build
naur at post11.tele.dk**20111029125848
 Ignore-this: f6c2b1dc96a87a80b18fd92a75197602
] 
[use shell harness to run unit tests
Florent Becker <florent.becker at ens-lyon.org>**20110622125855
 Ignore-this: d0c512445b3aa41425ac6e875e6575d0
] 
[allow shell harness to run unit tests
Florent Becker <florent.becker at ens-lyon.org>**20110622121520
 Ignore-this: 75a60c8708eab52ca96757c096843fdf
] 
[add .dpatch test data
Florent Becker <florent.becker at ens-lyon.org>**20110621095836
 Ignore-this: fff511bd3980260ad03e9781dec4c384
] 
[do not use dots in filenames for test/data, it confuses cabal sdist
Florent Becker <florent.becker at ens-lyon.org>**20110621095753
 Ignore-this: 8b50b23e13e63ba5eb9069763c7dd0df
] 
[Remove ShellHarness in darcs.cabal
Florent Becker <florent.becker at ens-lyon.org>**20110621090001
 Ignore-this: f619960851f793c75bc0c29a7193d1fb
] 
[Correct documentation files location in darcs.cabal
Florent Becker <florent.becker at ens-lyon.org>**20110621085512
 Ignore-this: 867399fa63cbb8f93fe988e409f0720f
] 
[Fix missing langinfo.h on Windows
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20111201085539
 Ignore-this: d0532ab32dd3411ccc3587ccf7a88c6d
 
 get_system_encoding will always return "utf8" on Windows, because darcs
 only uses it for a sanity check which is useless in most cases.
] 
[update text dep to make sure we have decodeUtf8'
ganesh at earth.li**20111130180617
 Ignore-this: 3065a967dc0ce344b625595032eb3872
] 
[Fix test suite for new makeEmail signature
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20111129144304
 Ignore-this: 2db7c38fab992729263c4c1468eb51d6
] 
[Guess ascii and utf-8 charsets
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20110829151604
 Ignore-this: 6f33eb837145256cabf6983eb4bf292c
 
 In case we cannot guess the charset, or when it is utf-8 but the locale
 differs, ask the user before sending.
] 
[Add a --charset flag for darcs send
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20110829150929
 Ignore-this: 4aeecd130252b835f173119acdf7ea6d
] 
[Add ByteStringUtils.isAscii
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20110829145046
 Ignore-this: 7a367f6470ae8698959c28d4b48ea670
] 
[Utility functions to check locale encoding
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20110829144818
 Ignore-this: b392156286c6997ad2d7f2cd606ff2b4
] 
[Add a donation button and link to front page.
Eric Kow <kowey at darcs.net>**20111123165156
 Ignore-this: 7249c0e13698a88502ba4f8bfc962baf
] 
[Export readPatchIds from HashedRepo.
Owen Stephens <darcs at owenstephens.co.uk>**20110831130050
 Ignore-this: 83332a677d985088ceaeeb53600a0efb
] 
[Update SFC link.
Eric Kow <kowey at darcs.net>**20110906130517
 Ignore-this: 281d59a260f872708759fb01c6ed0376
] 
[Give immediate useful advice when repository upgrade required.
Eric Kow <kowey at darcs.net>**20110906112458
 Ignore-this: e41903cfce510686bde50334253dfa73
 
 Don't make the user go to some web page if they just need to run a quick
 little command.
] 
[resolve issue2099: inline patch preview
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20110831171052
 Ignore-this: 76a12ad951856868f9eb511163ff0582
] 
[Add forgotten URL.Curl module.
Eric Kow <kowey at darcs.net>**20110903193027
 Ignore-this: 2fac738b8b4528abca1d5d3781b876af
 This was moved out from URL, but I forgot to add the file
 when I created the patch.
] 
[Slight readability tweak on URL.addReq
Eric Kow <kowey at darcs.net>**20110903173124
 Ignore-this: 561e98d0956477447f35565239c4d81b
] 
[Redundant liftIO.
Eric Kow <kowey at darcs.net>**20110903172420
 Ignore-this: 99162bf3f2b9e9680d692cd3b29026ab
] 
[Break up urlThread into top-level functions.
Eric Kow <kowey at darcs.net>**20110903172259
 Ignore-this: daafef26513bdddb09081da32cc628f5
 We lose the fact the helpers were internal to urlThread, but we
 probably gain in maintainability.
] 
[Reorganise URL fetching code.
Eric Kow <kowey at darcs.net>**20110903170216
 Ignore-this: b653897c0229c807c5c148a6de724f41
 
 - Move everything under the URL hierarchy
 - Split curl stuff into   URL.Curl
 - Split shared types into URL.Request
] 
[Darcs.IO needs MultiParamTypeClasses
Ganesh Sittampalam <ganesh at earth.li>**20110818184648
 Ignore-this: 255c1f70b4bb64822bdc110b781332fb
] 
[add output to darcs replace force
Alexander Njemz <f.alexander.njemz at gmail.com>**20110814162311
 Ignore-this: 3eafd0b4d4fc2b82c8c7359662709c99
] 
[remove-some-compiler-warnings-for-IO.hs
Alexander Njemz <f.alexander.njemz at gmail.com>**20110814142147
 Ignore-this: 17db94b9b17a9cc0de5b70c282d136e
] 
[Add support for since as a date operator
Jeff Foster <jeff.foster at acm.org>**20110812151153
 Ignore-this: b19638d473422bc0582a0314da04a414
 
 since is treated as a synonym of after.
] 
[Add a missing ApplyState p ~ Tree constraint on readRepoFromInventoryList.
Petr Rockai <me at mornfall.net>**20110818130556
 Ignore-this: fceb0ab9c2e877a8e5aa1e3998587c03
] 
[Add readRepoFromInventoryList
Owen Stephens <darcs at owenstephens.co.uk>**20110813133716
 Ignore-this: f5280cedf93e240ed9356c06e2f21203
] 
[Correct spelling of writePatchIfNecesary
Owen Stephens <darcs at owenstephens.co.uk>**20110813094121
 Ignore-this: 461e568e6ac5bc962f25b21729ca0d9d
] 
[Expose writePatchIfNecesary function
Owen Stephens <darcs at owenstephens.co.uk>**20110813093945
 Ignore-this: bb9b1492307131bc9e88b3538ce8bd7f
] 
[update NEWS log with 2.5.1 and 2.5.2 entries
Guillaume Hoffmann <guillaumh at gmail.com>**20110816003615
 Ignore-this: 920a166b1ba4aec42844688594743e9f
] 
[hlint on Darcs.Commands.Get module
Guillaume Hoffmann <guillaumh at gmail.com>**20110816000203
 Ignore-this: 870d5d45a7a673ffa979b3967694d288
] 
[use intercalate instead of concat and intersperse
Guillaume Hoffmann <guillaumh at gmail.com>**20110815235546
 Ignore-this: ee28df2b9a793609f6bfc2d54310eac0
] 
[Add a couple of UndecidableInstance pragmas, for the benefit of GHC < 7.
Petr Rockai <me at mornfall.net>**20110815211125
 Ignore-this: ec4cabbe9e4f67fe3bd3aef2eb788255
] 
[Implement missing methods in ApplyMonad instance for HSM.TreeMonad.
Petr Rockai <me at mornfall.net>**20110814124141
 Ignore-this: ce276a6d0c97c53cd7806fba469bdcf1
] 
[Fix up contexts, allowing all of darcs to build.
Petr Rockai <me at mornfall.net>**20110814121538
 Ignore-this: aee8a2110cdeafecf6d7e3fb050ba2c0
] 
[Add a missing associated type to ApplyMonad AnnotatedM instance.
Petr Rockai <me at mornfall.net>**20110814102135
 Ignore-this: b9011faeb491cb32189f26e24618229
] 
[Elaborate the definition of ObjectMap (i.e. make it more realistic).
Petr Rockai <me at mornfall.net>**20110724201809
 Ignore-this: 79cd2cddcbcd2cc7d0abf75710349510
] 
[Move from a Maybe monad in testing to Either String.
Petr Rockai <me at mornfall.net>**20110724201714
 Ignore-this: 4c791544f80e53fc2ffdbf41f5fd2899
] 
[Generalise the inverseComposition test.
Petr Rockai <me at mornfall.net>**20110723150641
 Ignore-this: 9389a78aef5418eeb206de92d4b43083
] 
[Further break up the Patch tests into "generic" categories.
Petr Rockai <me at mornfall.net>**20110723114516
 Ignore-this: 3875481ff5fbb3e9065447a8e8199f51
] 
[Clean up the test lists a little.
Petr Rockai <me at mornfall.net>**20110721121229
 Ignore-this: 66b7272c59a4274d8ab3ef1002d82487
] 
[Resolve conflict with Owen in Darcs.Match.
Petr Rockai <me at mornfall.net>**20110814085933
 Ignore-this: 7770d612cacbf87ee1087151029e586
] 
[Implement rudimentary Show/Read instances for V3 prims. All tests pass now.
Petr Rockai <me at mornfall.net>**20110711193951
 Ignore-this: 5bdd32534bae5c9186e41e0aa3b2c68
] 
[Fill in more blanks in V3 Prim implementation.
Petr Rockai <me at mornfall.net>**20110709175157
 Ignore-this: 751bc5ce49141e1681f23925e3cb0642
 
 With the current test coverage (generic Prim tests), we are only missing
 read/write to pass everything. Of course, we want to eventually improve test
 coverage, which should lead to further exposed gaps.
] 
[Start filling in gaps in the V3 prims.
Petr Rockai <me at mornfall.net>**20110709095939
 Ignore-this: 69ac3d0575dc612988e9268944f5995a
] 
[Lift localIdentity into PrimClassify (as anIdentity).
Petr Rockai <me at mornfall.net>**20110709094411
 Ignore-this: 3f71de67d9b80bc216f39cf615c10646
] 
[Generalise the Apply class by introducing an ApplyState associated type.
Petr Rockai <me at mornfall.net>**20110709091038
 Ignore-this: 3582a7250218a559883a3ef8208aee7a
 
 The ApplyState type corresponds to the object that the patches manipulate. For
 traditional (V1) Prims, this is a Tree, representing a filesystem tree. For V3
 Prims, this will likely be an uuid -> object map, or a variation thereof.
 
 In an ideal world, apply would be :: patch -> ApplyState patch -> ApplyState
 patch, but for efficiency reasons, we want to evaluate patch application in a
 monad, and also embed unevaluated monadic computations within the state object
 itself. Therefore, (ApplyState patch) is :: (* -> *) -> *, the parameter being
 a monad, like what Tree expects. In normal Darcs, this will be IO, but most
 operations are expected to be monad-independent. We use Maybe in the testsuite.
] 
[Enable tests for V3 prims and V2 patches with V3 prims (all fail).
Petr Rockai <me at mornfall.net>**20110705084358
 Ignore-this: af4a1f5bcfe9a0b0f36d5a77a15a6cf3
] 
[Parametrise part of Patch.V2 tests over the Prim to use.
Petr Rockai <me at mornfall.net>**20110705084235
 Ignore-this: 9f24195d676321d898d7c2b704bd2b33
] 
[update check-read-only test so it fails properly
Ganesh Sittampalam <ganesh at earth.li>**20110813160615
 Ignore-this: 223c73e43df13a7cab9486bd32dfff38
 Looks like we need 'diff -r' to get a failing exit code, at least
 on Windows
] 
[Hlint: redundant brackets
Eric Kow <kowey at darcs.net>**20110813104159
 Ignore-this: f652c23d3f24eccb3491e8879e59f31a
] 
[Add a 'o' command to interactive selection for going to the first patch
Florent Becker <florent.becker at ens-lyon.org>**20110615083724
 Ignore-this: 91fbe053f66fe17f6967236d2362ab54
] 
[Add Witnesses.WZipper.toStart
Florent Becker <florent.becker at ens-lyon.org>**20110614154536
 Ignore-this: 56ac8efb363fedab4080bd3af886728c
] 
[make hspwd depend on the hierarchical libraries instead of haskell98
Ganesh Sittampalam <ganesh at earth.li>**20110813141002
 Ignore-this: 83465156fd2e50dc2b709706b665ed54
 As of GHC 7.2, there isn't a portable way to build against haskell98
 because in GHC 7.2 it exports Prelude which clashes with base, but
 in <7.2 it doesn't export Prelude.
 
] 
[hlint: removed redundant $
Johannes Weiss <weiss at tux4u.de>**20110812161455
 Ignore-this: 95aab034a9c3125f0af02792ef87b4b1
] 
[Redundant do-notation
Sebastian Korten <sebastian.korten at gmail.com>**20110812103451
 Ignore-this: 5e676e86a09105225338d303d3a11443
] 
[resolve issue1681: when there are conflicts, output red text.
Jeff Foster <jeff.foster at acm.org>**20110812133939
 Ignore-this: 435534dfbc1918db4387f277630127ea
] 
[hlint replace take/repeat with replicate
Jeff Foster <jeff.foster at acm.org>**20110812111033
 Ignore-this: 8f6496249272962a08e39b7b01371c8b
] 
[Add addToSpecificInventory function, for use in darcs-fastconvert
Owen Stephens <darcs at owenstephens.co.uk>**20110801111312
 Ignore-this: 791770eaf185529901f7182a21c62cd1
] 
[Remove duplicated pending reading code in readRecordedAndPending
Owen Stephens <darcs at owenstephens.co.uk>**20110727153044
 Ignore-this: a05037c4f4b968ed07ac4557f35c57be
] 
[Re-enable machine-readable annotate output.
Owen Stephens <darcs at owenstephens.co.uk>**20110711101420
 Ignore-this: 555be183bff846526eebf599c0cf9a9e
 The code was commented out, see
 http://irclog.perlgeek.de/darcs/2011-07-05#i_4062389 but I required it, and it
 seems worthwhile to keep the feature enabled.
] 
[Robustify issue 2067 test for Mac OS X
naur at post11.tele.dk**20110704190817
 Ignore-this: ccb9e1098c3d6c8d0eb1108330894e5
] 
[Fix error with unhandled --index in show contents
Owen Stephens <darcs at owenstephens.co.uk>**20110629115716
 Ignore-this: 90cf86d9b9e4a265ce173a51f8849dbe
] 
[support GHC 7.2
Ganesh Sittampalam <ganesh at earth.li>**20110812093538
 Ignore-this: 75de9a5685875a03d1f3993f636781ae
] 
[drop INLINE pragmas on class members
Ganesh Sittampalam <ganesh at earth.li>**20110812093513
 Ignore-this: b73bfc53913b62e8640e4bae91b0c885
 ghc 7.2 now automatically does what this used to do, and doesn't accept
 the pragma. It doesn't seem worth including it conditionally for earlier
 versions.
] 
[hlint do notation
Alexander Njemz <f.alexander.njemz at gmail.com>**20110812142736
 Ignore-this: b8d5b1860fa371452dd894b8acef2f40
] 
[export getPatchBundle - useful for library API
Ganesh Sittampalam <ganesh at earth.li>**20110712063425
 Ignore-this: 4ab8ac5d702af956071f2aceaf9492d1
] 
[Accept issue2086: darcs forgets _darcs/index permissions.
Eric Kow <kowey at darcs.net>**20110710205410
 Ignore-this: 33a93cb05c2cd092cdd62c0d6f051217
] 
[More appropriate explanation for hunk-editing in revert
Florent Becker <florent.becker at ens-lyon.org>**20110701200311
 Ignore-this: b09150b94660adf47e34a6d999d5f5c2
] 
[TAG 2.9.0
Florent Becker <florent.becker at ens-lyon.org>**20110701163405
 Ignore-this: 8fdfcedeb11b3e591eeec3857176acfd
] 
[Disable part of Patch tests in GHC<7 (requires GHC7-style impredicativity).
Petr Rockai <me at mornfall.net>**20110628123937
 Ignore-this: 1a8446e7a81ac6f6600476e93e003278
] 
[Add a couple of extra constraints required by GHC6.
Petr Rockai <me at mornfall.net>**20110628123853
 Ignore-this: fde30a8afd4a547f47fd55c9e3551d16
] 
[Remove unneeded LANGUAGE pragmas from Examples.Set2Unwitnessed.
Petr Rockai <me at mornfall.net>**20110626232915
 Ignore-this: eb6822440303a956e5916cdc1ee87608
] 
[Replace FunctionalDependencies with TypeFamilies in new test code.
Petr Rockai <me at mornfall.net>**20110626232821
 Ignore-this: a5cc549db0763a52a9448ad4ac2fa842
] 
[Implement V3Model and rudimentary V3.Prim Arbitrary instances.
Petr Rockai <me at mornfall.net>**20110626225347
 Ignore-this: 6b482134980b42928c3cf89c824b2031
] 
[Lift RepoModel into a class and rename the implementation to V1Model.
Petr Rockai <me at mornfall.net>**20110626225332
 Ignore-this: 1940e94c35c50c54e796730d9f04f23a
] 
[Wibble the V3 Prim skeleton a bit.
Petr Rockai <me at mornfall.net>**20110626225250
 Ignore-this: f8f42882f33dec6192d958a5b23c4bb4
] 
[Add a forgotten Properties.Check module to Test.Patch.
Petr Rockai <me at mornfall.net>**20110626215754
 Ignore-this: fdf9601a9e10aea35ce827b609e11b01
] 
[Replace tMergeSwapMerge with Properties.Generic mergeEitherWay.
Petr Rockai <me at mornfall.net>**20110621142303
 Ignore-this: 6c9e1def0a1773fbf3785985b3a0355f
] 
[Replace tCommuteRecommute with recommute from Properties.Generic.
Petr Rockai <me at mornfall.net>**20110621142250
 Ignore-this: 51cf667adc21f849934930499ddf60d0
] 
[Further restructuring of QC properties of patches.
Petr Rockai <me at mornfall.net>**20110621141311
 Ignore-this: 9e3d414e742a6deb6609a2c8dd71faed
] 
[Slightly restructure and expand the Prim Arbitrary instances.
Petr Rockai <me at mornfall.net>**20110621141234
 Ignore-this: bf95d5786f1bc1a3ec2e3e3e361c2384
] 
[Print detailed diagnostic in patchAndInverseCommute.
Petr Rockai <me at mornfall.net>**20110621141112
 Ignore-this: f63f87d199f12fed09226bd43184f203
] 
[Split Test.Patch.Test into Properties.Check and Arbitrary.PatchV1.
Petr Rockai <me at mornfall.net>**20110620133651
 Ignore-this: 16322561bc5c8dd5c356e632bb7d22ef
] 
[Generalise a bunch of merge/commute properties over the patch type & generator.
Petr Rockai <me at mornfall.net>**20110620123354
 Ignore-this: fd5b45e576226d719531182bedd5ac9d
] 
[Generalise the V1.Prim Arbitrary instance based on Tree to any PrimPatch.
Petr Rockai <me at mornfall.net>**20110620123027
 Ignore-this: 289e1227afffcec6484ce10a477f977a
] 
[Reorganise the Patch tests further.
Petr Rockai <me at mornfall.net>**20110620091810
 Ignore-this: b9bc5870d025d29d9d3d2dbd0fe950ad
] 
[Remove redundant imports in Darcs.Repository.Internal.
Petr Rockai <me at mornfall.net>**20110620090718
 Ignore-this: 85333a422e8c83d6b8080dfde97aee1
] 
[Make (V1) Prim an instance of PrimPatchBase/FromPrim.
Petr Rockai <me at mornfall.net>**20110620090658
 Ignore-this: 2534da30774aac84a09342c3fbcda80e
] 
[Add a Show1 instance for (:>).
Petr Rockai <me at mornfall.net>**20110620090641
 Ignore-this: f601c659c5a078eb1a337ff74e47d0dd
] 
[Merge Set2, Set2Unwitnessed and Set3Unwitnessed in Test.Patch.Examples.
Petr Rockai <me at mornfall.net>**20110605215512
 Ignore-this: 8c718a43d7e780f582b91900dd7464c5
 
 Set2 have been only used to implement Set3, and not directly by any
 tests. Everything is internal to Set2Unwitnessed now.
] 
[Cut down the initial Prim V3 code to +/- compilable minimum.
Petr Rockai <me at mornfall.net>**20110601081741
 Ignore-this: 4476d55f1f4cf86781a8fc38f28bd9c0
] 
[Bootstrap the V3 Prim patches as a clone of V1.
Petr Rockai <me at mornfall.net>**20110522113837
 Ignore-this: 5bf1b80760d246bef56f82889a49db33
] 
[Add missing PrimClassify functions for all PrimConstruct functions
Owen Stephens <darcs at owenstephens.co.uk>**20110627123132
 Ignore-this: 30475428ee95c18400b78a5141755600
] 
[Export new readRepoUsingSpecificInventory function.
Owen Stephens <darcs at owenstephens.co.uk>**20110615003451
 Ignore-this: 811e4288e2c22b5bd84332a49f0009db
] 
[Avoid alias on grep
girard.cedric at gmail.com**20110614120900
 Ignore-this: 4e3da04738bb905f61c1f74db7c57c0c
 If the user has defined an alias on the grep command (eg "alias grep='grep -n --color'") the bash completion would call the aliased command leading to unpredictables result.
] 
[make 'k' available in amend-record's selection
Florent Becker <florent.becker at ens-lyon.org>**20110615085323
 Ignore-this: 5281aa1c256d970d9e5540397b2122a
] 
[acknowledge put --no-set-default as default in tests
Florent Becker <florent.becker at ens-lyon.org>**20110614125208
 Ignore-this: 57d290a65b40e14c23c223014ca72746
] 
[resolve issue 2079: don't set default repository by default in put
Florent Becker <florent.becker at ens-lyon.org>**20110614122332
 Ignore-this: 4519d077289251e899273a81fb98a6b2
] 
[Resolve issue 2076: handle post-hoc move into an non-added directory
Florent Becker <florent.becker at ens-lyon.org>**20110614064643
 Ignore-this: 876ba96d55ee59e1f2a311f8b4da1ed7
] 
[resolve issue1473 : annotate --repodir works now
Florent Becker <florent.becker at ens-lyon.org>**20110614070901
 Ignore-this: d73caad407b4f517b7f3a7221d799384
 
 This is just observing that the bug has already been resolved, presumably
 by the new annotate code.
] 
[Refuse to add unreadable files
Florent Becker <florent.becker at ens-lyon.org>**20110610173912
 Ignore-this: 95907cf073b7077fd30432ebc6c1aca1
] 
[resolve issue1727: forbid moving the root of the repository
Florent Becker <florent.becker at ens-lyon.org>**20110610134433
 Ignore-this: 7b195f350fdc8a291599cd1a06d94cce
] 
[resolve issue1740: handle post-hoc darcs mv for directories correctly
Florent Becker <florent.becker at ens-lyon.org>**20110610133124
 Ignore-this: 3e6f3974bce7dafa7bff9acf00c4dd44
] 
[resolve issue1714: make --no-{pre,post}hook and --{pre,post}hook interact sensibly
Florent Becker <florent.becker at ens-lyon.org>**20110610083029
 Ignore-this: 2b4453030077be0ef62b3e699853887d
] 
[Accept issue1714: ALL mutex + foo no-mutex shouldn't reduce to foo mutex.
Trent W. Buck <trentbuck at gmail.com>**20110610082149
 Ignore-this: 2a0d60c485a3a92e396ef3e903c8c589
] 
[aknowledge status of issue1848
Florent Becker <florent.becker at ens-lyon.org>**20110606194717
 Ignore-this: 4ac467fd3cace9c0a70e5a096cb4f455
] 
[correct haddock in Printer
Florent Becker <florent.becker at ens-lyon.org>**20110527135651
 Ignore-this: 4c5ed513988ed8e37576d2442d05e91b
] 
[Bump the HTTP dependency to >= 4000.0.8, which introduced setCheckForProxy.
Petr Rockai <me at mornfall.net>**20110605134415
 Ignore-this: 77ca3311bed0a3dadac306acd56d5908
] 
[Update contrib/install-deps.sh.
Petr Rockai <me at mornfall.net>**20110605125217
 Ignore-this: 74f00a6087cbc4afcba65d92428cfe8
 
 - Since we now have -f-executable (as well as already existing -f-library and
   -f-test), let's use those flags instead of -fdeps-only which was semi-broken
   for a while now. Drop -fdeps-only from darcs.cabal.
 - Since recent cabal-install has an install --only-dependencies command,
   leverage that when available and only fall back to the original kludge with
   old cabal-install versions.
] 
[Support init/get --no-working-dir and pseudo-applying to wd-less repos
Florent Becker <florent.becker at ens-lyon.org>**20110424220302
 Ignore-this: 3bc5d6607206f0099f257a1f6ff236d4
] 
[Resolve issue 2021: make escaping not split strings too much
Florent Becker <florent.becker at ens-lyon.org>**20110603145526
 Ignore-this: 2439e11ef82985f5c3bce968b9ec13fd
] 
[resolve issue2066: file does not exist when recording deleted file
andreas.brandt.de at googlemail.com**20110522231128
 Ignore-this: d225dda60711f060ce9f41fbb716eca9
] 
[Accept issue2066: file does not exist when recording deleted file
andreas.brandt.de at googlemail.com**20110522224148
 Ignore-this: 1903274769d48300658ac01d34bdaadd
] 
[Accept issue2076: "darcs mv file dir" confuses darcs
Lennart Kolmodin <kolmodin at gmail.com>**20110602132934
 Ignore-this: 501aff4e6432075dfe9f59845bf6c119
] 
[Fix up test group labels.
Petr Rockai <me at mornfall.net>**20110601212525
 Ignore-this: af123491435e3cf2600f0e670c335c84
] 
[Fix a number of warnings, making the tests compile with -fwarn-as-error.
Petr Rockai <me at mornfall.net>**20110601210304
 Ignore-this: 4bd6081a601e31b4b8aadcaf6391e896
] 
[Move the test list from Properties.V1Set2 to Darcs.Test.Patch.
Petr Rockai <me at mornfall.net>**20110601203553
 Ignore-this: 9ce577145dccc5db377f7d128be708fa
] 
[Merge Darcs.Test.Patch.Prim.V1 into Darcs.Test.Patch.Arbitrary.PrimV1.
Petr Rockai <me at mornfall.net>**20110601203504
 Ignore-this: 67d643398ed84ddebe135caf78bbe1c4
] 
[Explode Darcs.Test.Patch.Unit2 and Darcs.Test.Patch.QuickCheck.
Petr Rockai <me at mornfall.net>**20110601202630
 Ignore-this: 9fc065f37f8dde548c5b5f3bc0953d6b
] 
[Explode Darcs.Test.Patch.Unit into example/property sets + WSub.
Petr Rockai <me at mornfall.net>**20110601185607
 Ignore-this: 6092018db2a667f85bc1f27495ffc4cf
] 
[Add flag to avoid building darcs executable (-f-executable, like -f-library).
Petr Rockai <me at mornfall.net>**20110601181200
 Ignore-this: 920dccdbca23187a5461ba799657e5dd
] 
[Shuffle the PropertiesN and ExamplesN test modules into a hierarchy.
Petr Rockai <me at mornfall.net>**20110601180736
 Ignore-this: 51aa6f76476725837c41d377dff7d501
] 
[Make Darcs.Test.Patch.Properties independent of (V1) Prim implementation.
Petr Rockai <me at mornfall.net>**20110601174616
 Ignore-this: 276f1dba467b3404f8a39f59cd59da8d
] 
[Break out Properties3 out of Darcs.Test.Patch.Examples, split up test groups.
Petr Rockai <me at mornfall.net>**20110601174331
 Ignore-this: 1603b114a9094df9675b06ea7334ace9
] 
[Bump regex-posix and regex-compat dependencies to use segfault-free version.
Owen Stephens <darcs at owenstephens.co.uk>**20110509191041
 Ignore-this: 4982e7ed6efc51d1f5c47845e96bdf88
] 
[Fix test using incorrect grep pattern for failed add.
Owen Stephens <darcs at owenstephens.co.uk>**20110519215931
 Ignore-this: f6bedc100f8a523a97a17b025ce12bf8
] 
[Make no changes if any to-be-added file errors.
Owen Stephens <darcs at owenstephens.co.uk>**20110519215759
 Ignore-this: 3c4858ba7559179b6ddcc189216624a7
 Prior to this patch, the first file to be added to a new directory would
 implicitly add the directory. If the file itself didn't exist, the
 directory-add would still be present. Now, if any file-add fails, no changes
 are made.
] 
[build fix for win32
Ganesh Sittampalam <ganesh at earth.li>**20110521212358
 Ignore-this: c4e687266cbe22f731c93494d0d8b610
] 
[Ignore files in darcsdir, even with --boring
Scott Lawrence <bytbox at gmail.com>**20110509053505
 Ignore-this: f8d5c65b1e67992a086693b1bf092601
] 
[Fix warnings in new unrecordedChanges code via slight refactoring
Scott Lawrence <bytbox at gmail.com>**20110509025948
 Ignore-this: 51ac5e312ba190c9819e96c8a7a5712f
] 
[Resolve issue2054: option --boring does not work with self-made boringfile
Scott Lawrence <bytbox at gmail.com>**20110509023517
 Ignore-this: 5dccf05526201c981c6a76f96de5e044
] 
[Make check a read-only operation
Florent Becker <florent.becker at ens-lyon.org>**20110505123430
 Ignore-this: f7be773d58384f98adc200db3d6df74f
] 
[Resolve issue2067: inexsitant files result in empty lines in darcs
Florent Becker <florent.becker at ens-lyon.org>**20110510122208
 Ignore-this: 955ca17ff9d2bd51b36934de76f51d70
] 
[Improve resolution of issue1611 by avoiding unnecessary warnings
Iago Abal <iago.abal at gmail.com>**20110405002624
 Ignore-this: 72b6b2606acc0ed307a46e57ca904742
] 
[Regression test for issue1611
Iago Abal <iago.abal at gmail.com>**20110405001718
 Ignore-this: 68e62bcb42c0759f24dc18ffeba11d52
] 
[Resolve issue1640: darcs apply --verbose without args mentions stdin.
Radoslav Dorcik <dixiecko at gmail.com>**20110424111051
 Ignore-this: a02a9f42e0ad2e2c4e9dd09024b38d8e
] 
[Test for issue1640: darcs apply --verbose without args mentions stdin.
Radoslav Dorcik <dixiecko at gmail.com>**20110424104917
 Ignore-this: 96e0f98d52948fcb286e692942408516
] 
[Resolve issue1661: make add --quiet quieter
bytbox at gmail.com**20110422070336
 Ignore-this: a5353eb723ddcedf3d8dc9c1ab6841a4
] 
[Resolve issue1804: friendlier message when adding missing files.
Eric Kow <kowey at darcs.net>**20110407171049
 Ignore-this: b221e137f9e958d62b4c57738af7828e
 
 Instead of
   darcs: foo: getSymbolicLinkStatus: does not exist (No such file or directory)
 We now have
   File foo does not exist!
] 
[Friendlier exceptions when a file does not exist.
Eric Kow <kowey at darcs.net>**20110407142847
 Ignore-this: eba392bc8c664ac2316816366fc805fb
] 
[Add a failing test for issue2066.
David Caldwell <david at porkrind.org>**20110418232150
 Ignore-this: 6ba2e9d4f44ff232da9eae715810bab9
 darcs record fails when deleted file and added file are specified on the command line
] 
[Fix remaining warnings in the new annotate code.
Petr Rockai <me at mornfall.net>**20110427010645
 Ignore-this: 3e2c5db4613e64048a0382a4f32d7f01
] 
[Fix how 'Prim' patches generator creates patches
Iago Abal <iago.abal at gmail.com>**20110423182904
 Ignore-this: d6f37fc739cd4a6ef5d82d36d8c0cea4
 Patches were creaated without using 'PrimContruct' constructors
 and that was producing file names that were not properly
 normalized. This problem caused tests to fail on Windows.
] 
[make optimize garbage collect pristine before any other optimization
Guillaume Hoffmann <guillaumh at gmail.com>**20110406083814
 Ignore-this: 76c674c1ac56d770ca5aca4b57db51b1
 This has the effect that optimize --http produces a minimal
 basic.tar.gz pack.
] 
[remove two exported unused functions from Darcs.Externals
Guillaume Hoffmann <guillaumh at gmail.com>**20110410173711
 Ignore-this: 9b2128dd19efe843d8e25c310d3a64b3
] 
[no longer use init's advanced options for get
Guillaume Hoffmann <guillaumh at gmail.com>**20110410113544
 Ignore-this: c4e71d037bcb202c4b739866c75af886
] 
[Remove unneeded parsePatches function, slightly refactor parseBundle to better describe intent.
Owen Stephens <darcs at owenstephens.co.uk>**20110417113737
 Ignore-this: 338e34e61ee21bb335a92083dc083e92
] 
[Tidy up, and add most Haddocks for Darcs/Patch/Bundle.hs
Owen Stephens <darcs at owenstephens.co.uk>**20110417030928
 Ignore-this: 47cbd1f03b28fd90dc1e6f70f5ad4c62
] 
[Remove unused parameter from hashBundle function.
Owen Stephens <darcs at owenstephens.co.uk>**20110417030856
 Ignore-this: 9bd7867bc5778eeab18e6ef873042e90
] 
[Fixup failing diff tests, due to fix for issue 2052.
Owen Stephens <darcs at owenstephens.co.uk>**20110407011159
 Ignore-this: be23e3a04970d7c490f6bcb0da31ace4
] 
[Add regression test for issue 2052.
Owen Stephens <darcs at owenstephens.co.uk>**20110407011028
 Ignore-this: 635a2edb91d7c484ea6f6c0c88cf3a80
] 
[resolve issue2052: Implicitly use unified diff, unless told not to.
Owen Stephens <darcs at owenstephens.co.uk>**20110407000436
 Ignore-this: 311b3f81f0d3478c5099e05986ac15c2
] 
[resolve issue1665: wrong default suggestions for Windows
Chris Trompette <chris at trompette.name>**20110406202958
 Ignore-this: f5c4602f3038fc9f7b18457789c6a911
] 
[drop unneeded MonadPlus AnnotatedM instance
Ganesh Sittampalam <ganesh at earth.li>**20110415184915
 Ignore-this: 2c0c6a05ae678aa01c4910caf61d9dbf
] 
[Ignore thisrepo source.
Owen Stephens <darcs at owenstephens.co.uk>**20110401152106
 Ignore-this: a31b7767b8b8c0be7fde52723a43a155
 Do not read or write the 'thisrepo' source to the prefs/sources file.
] 
[Forward-port a darcs show contents optimisation.
Petr Rockai <me at mornfall.net>**20110409153105
 Ignore-this: 7461412fe5a416879e6d0660df4cd1a3
] 
[Forward-port ApplyMonad.
Petr Rockai <me at mornfall.net>**20110409153100
 Ignore-this: 222d2f68b2599a3acd349fa44ad05358
] 
[Fix a couple of shadowing warnings in Darcs.Annotate.
Petr Rockai <me at mornfall.net>**20110406123605
 Ignore-this: bf0814b0937d9a641320a1b09c0c685b
] 
[Slash unused Population code.
Petr Rockai <me at mornfall.net>**20110402204826
 Ignore-this: 88e6fc48192b914474be6a1690a2476c
] 
[Forward-port of a new annotate implementation.
Petr Rockai <me at mornfall.net>**20110402204820
 Ignore-this: 1899eaea009da4e1feb484ba8a5949e5
] 
[add test for get --verbose reporting getting packed repository
Guillaume Hoffmann <guillaumh at gmail.com>**20110406082603
 Ignore-this: 53910d6a91736d97f882671421ab30e1
] 
[make get --verbose report getting packed repository
Guillaume Hoffmann <guillaumh at gmail.com>**20110406082514
 Ignore-this: 9ae6f1003a682a82d9e770670cb55df
] 
[remove darcs resolve alias for mark-conflicts
Guillaume Hoffmann <guillaumh at gmail.com>**20110406110848
 Ignore-this: 7c3ad3ea63e6eeffd6dc449898a9d76c
] 
[remove mentions of darcs resolve in two tests
Guillaume Hoffmann <guillaumh at gmail.com>**20110406110510
 Ignore-this: e6939c1465345cb50a13f86755c4d2dd
] 
[remove mention of darcs resolve in manual
Guillaume Hoffmann <guillaumh at gmail.com>**20110406110453
 Ignore-this: f31b17eea2c48880b9cb1250b44ba95b
] 
[update help string for mark-conflicts
Guillaume Hoffmann <guillaumh at gmail.com>**20110406105713
 Ignore-this: 1a983dda7cc801fe47a4cb11ba1f8cb6
 reflects new conflict marking, and remove mention to resolve alias
] 
[fix warnings in URL when building without curl
Ganesh Sittampalam <ganesh at earth.li>**20110406201137
 Ignore-this: c4fdab40c52c6dde47ade87a697ae84f
] 
[fix warnings on win32 in Darcs.Commands.Send
Ganesh Sittampalam <ganesh at earth.li>**20110406201048
 Ignore-this: b4a2c718de79da2329cd05fb1617f1d4
] 
[add -fwarn-as-error for building with -Werror
Ganesh Sittampalam <ganesh at earth.li>**20110406182130
 Ignore-this: d08c4c8550005847f5dcc6ecfbddd7a9
] 
[fix warnings in Darcs.Patch.Prim.V1.Commute
Ganesh Sittampalam <ganesh at earth.li>**20110211184143
 Ignore-this: eb63e9ea65bf1d54e3a676ad19604261
] 
[fix warning in Darcs.Arguments
Ganesh Sittampalam <ganesh at earth.li>**20110211180541
 Ignore-this: f122cf25b7203d57f873ab37a3df5422
] 
[delete dead code from win32 System.Posix
Ganesh Sittampalam <ganesh at earth.li>**20110211080702
 Ignore-this: 221b274a36de7abf34f380abd2484c64
] 
[remove tab characters
Ganesh Sittampalam <ganesh at earth.li>**20110211080459
 Ignore-this: 598415a91f2038d31447ccf58417293b
] 
[restrict export list from win32 System.Posix
Ganesh Sittampalam <ganesh at earth.li>**20110211080410
 Ignore-this: 1259f0bb0c5d2d5eee889e3008689289
] 
[missing newline at end of Darcs.Repository.ApplyPatches
Ganesh Sittampalam <ganesh at earth.li>**20110406174651
 Ignore-this: c0d7b963a087e208d4ff0b349250c7e7
] 
[Using proxy without libcurl
Chris Trompette <chris at trompette.name>**20110331181219
 Ignore-this: 258b619264161732b858cb4548bbc81f
] 
[get rid of MonadPlus requirement for Readable/WriteableDirectory
Ganesh Sittampalam <ganesh at earth.li>**20110404174812
 Ignore-this: d4af54f3857cab44032c1bfe833db627
] 
[generalise type of applyPatches using a new MonadProgress class
Ganesh Sittampalam <ganesh at earth.li>**20110404174541
 Ignore-this: 10f8d6135bbafd3f4476f95708aff2f5
] 
[refactor applyPatchesWithFeedback to improve generality
Ganesh Sittampalam <ganesh at earth.li>**20110403194755
 Ignore-this: 212233d3df1c3334490ac371a1398c94
] 
[drop unused export
Ganesh Sittampalam <ganesh at earth.li>**20110403182655
 Ignore-this: 3152f64ba965351e663451433a553e53
] 
[disable issue1344 test on Windows
Ganesh Sittampalam <ganesh at earth.li>**20110403172946
 Ignore-this: 7de1d32cbe85519e00f5abdf2dbbad48
] 
[remove unused function copySSHs
Guillaume Hoffmann <guillaumh at gmail.com>**20110403174632
 Ignore-this: 122d1249c1cb536a73a1ecd898e25d91
] 
[get rid of unused copyFilesOrUrls in Darcs.Externals
Guillaume Hoffmann <guillaumh at gmail.com>**20110403172920
 Ignore-this: e867c1854cd59c322380d2e757c2597e
] 
[get rid of unused copyOldRepoPatches
Guillaume Hoffmann <guillaumh at gmail.com>**20110403172302
 Ignore-this: a1c6ac18832452a72580dfe6f3476700
] 
[More flexible parsing of issue number in BTS/darcs integration.
Eric Kow <kowey at darcs.net>**20110403134018
 Ignore-this: 5680f82f247008d4ccb33f7b3f1dfef2
] 
[fix build error in usePacks (sorry!)
Ganesh Sittampalam <ganesh at earth.li>**20110403164246
 Ignore-this: d5b4106fd20edee9016476660ea793c0
] 
[Developers should fetch the screened repository.
Eric Kow <kowey at darcs.net>**20110402081442
 Ignore-this: 7ffb60ff3903e3e71527dd15fdf9c0b8
] 
[put defaulting logic for usePacks in Darcs.Flags
Ganesh Sittampalam <ganesh at earth.li>**20110403131404
 Ignore-this: 122ae79905121f89ebc63063f85ed609
] 
[make optimize --reorder conditionality clearer in the code
Guillaume Hoffmann <guillaumh at gmail.com>**20110402105537
 Ignore-this: 6971bd8bd14dd23ca9383a496e21a142
] 
[use standard error message for optimize --http on of repos
Guillaume Hoffmann <guillaumh at gmail.com>**20110402105509
 Ignore-this: b1f7d0dbff017c72f893e03840e41d9a
] 
[default darcs get to use packs
Guillaume Hoffmann <guillaumh at gmail.com>**20110402095725
 Ignore-this: dcb1de972d8dadce0424f6ca8071bb60
] 
[Resolve issue 1611: amend-record now forbids adding changes to a tag
Iago Abal <iago.abal at gmail.com>**20110402105638
 Ignore-this: 40e8f2a7c0e6dd5bbfe5f2cd1c4fc806
 NB: Perhaps the simplest possible solution, there is room for improvements.
] 
[Fix generation of Darcs2 patches to restore the rate of conflictors
Iago Abal <iago.abal at gmail.com>**20110401133441
 Ignore-this: 794286cd02ef21b19f608e3fc9336ac4
 The new generator of primitive patches tends to produce a higher rate of
 independent patches so the rate of conflictors was decreased as a side effect.
] 
[Make use of bSized for generation of arbitrary trees and files
Iago Abal <iago.abal at gmail.com>**20110401133332
 Ignore-this: 4e3675055ccb2535ee4a698b8e28d38e
] 
[Adjust comment making reference to removed code
Iago Abal <iago.abal at gmail.com>**20110401132520
 Ignore-this: 938f09e65d173894409aebb5c0641af2
] 
[Test effect preserving property of join operation
Iago Abal <iago.abal at gmail.com>**20110401130923
 Ignore-this: 5f3d5c0e9e6af284da78a5edacd39057
] 
[Replace old RepoModel by Darcs.Test.Patch.RepoModel
Iago Abal <iago.abal at gmail.com>**20110401130551
 Ignore-this: 828c8c16282711e4fe9752f5f4a05e98
] 
[Remove Darcs.Test.Patch.QuickCheck shrinker
Iago Abal <iago.abal at gmail.com>**20110401110751
 Ignore-this: 4c8a2a8e8a0e0b28fdd4fd33133ec642
 It is necessary to remove the shrinker in order to replace the old RepoModel by the
 Darcs.Test.Patch.RepoModel one. 
 NB: Ganesh will submit a new shrinker (RepoModel agnostic) briefly.
] 
[Clean up of Darcs.Test.Patch.WithState
Iago Abal <iago.abal at gmail.com>**20110401104247
 Ignore-this: 4ddf5244edcb589b0e3fb047070aee05
] 
[Several fixes for RepoModel and Prim generators
Iago Abal <iago.abal at gmail.com>**20110222180748
 Ignore-this: 59a642f068eec45105429170f94aee3c
 These fixes dramatically improve coverage of generators.
] 
[Apply patches to RepoModels via Darcs.Patch.Apply.applyToTree
Iago Abal <iago.abal at gmail.com>**20110222180626
 Ignore-this: 53af3f8bc18c0e7a0edc403e9cb0bb5d
] 
[Add "bounded sized" generator combinator
Iago Abal <iago.abal at gmail.com>**20110222175222
 Ignore-this: 71f71ac807d0093255c7cf669e173189
 This combinator should make easier to define accurate sized generators,
 preventing some bugs occurred in the past.
] 
[Generalize type of applyToTree
Iago Abal <iago.abal at gmail.com>**20110222121928
 Ignore-this: e5da54b6f562a7fb3d68b77633824125
 NB: virtualTreeIO is just virtualTreeMonad with restricted type.
] 
[Add more tests about invert and for FL Prim into Unit2 testsuite
Iago Abal <iago.abal at gmail.com>**20110221203259
 Ignore-this: 53b6af2bdb51905c23d8bb09759fa90d
] 
[Remove duplicated/unused Arbitrary instance for FL Prim
Iago Abal <iago.abal at gmail.com>**20110221185955
 Ignore-this: 85b381d771f485ce1fd33cb6516fc4f7
] 
[Show instance for RepoModel
Iago Abal <iago.abal at gmail.com>**20110221184125
 Ignore-this: 2f804b395d80d32f1630d10308477ae2
] 
[ArbitraryState refactoring
Iago Abal <iago.abal at gmail.com>**20110219235239
 Ignore-this: e76c15ab8f833879089d5389c4d39ac1
   - ArbitraryState class and its generic instances were moved to Darcs.Test.Patch.WithState
   - Darcs.Test.Patch.Prim.V1 generators are now based on ArbitraryState class.
   - Arbitrary instance for (Prim :> Prim :> Prim) is now based on the new RepoModel 
     and Prim patches generator.
   - joinCommute could not be valid if some patch is an empty-hunk so now it is
     conditionally tested.
   - Darcs.Test.Patch.Prim.V1.aHunk generator was fixed to produce less empty-hunks.
] 
[Remove duplication of With*State code
Iago Abal <iago.abal at gmail.com>**20110219121822
 Ignore-this: 30cbf850cc8af07b81fc6b0d2963e4ff
] 
[Fix With*State witnesses mess
Iago Abal <iago.abal at gmail.com>**20110219121702
 Ignore-this: 5ddfaec678879c7ca26095d18158856d
] 
[Changed return type of promptYorn to IO Bool
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20110401130419
 Ignore-this: 7883f2fcb25f49b5aea75820ef101238
] 
[Fix conflict (because of $- removal)
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20110120161605
 Ignore-this: 4c7e58daa764f92df607334707261650
] 
[resolve issue2013: handle --to flags in darcs send --context
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101210081111
 Ignore-this: 8a9b94ab5675ad26d6f41fece9390527
] 
[Change the type of identifyRepoFormat to match the common use case
Dmitry Tsygankov <dmitry.tsygankov at gmail.com>**20110401123738
 Ignore-this: 5c6ddfcf0dbd3621e1c014fd0178d7c6
] 
[Test issue2012: darcs send -o shall not print a "will be sent to" line
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101215144619
 Ignore-this: b5e2670b636305717c22fa4dbc0a1120
] 
[Test issue1344: fail early if sendmail is not available
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101215140019
 Ignore-this: f45a8be9d26f4e78e4505f11db5976dc
] 
[Test issue2013: do not ignore --to in darcs send --context
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101215140006
 Ignore-this: 53a46ea61c5b5aea9abde2c2cbd114cc
] 
[resolve issue1344: abort early if can't send
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101210094610
 Ignore-this: 42f5d52f6e1ef0001a6f458b252e4ee4
] 
[Export Darcs.Externals.haveSendmail
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101209135204
 Ignore-this: f14d47c6a8e01e852c91cd8dc22e0535
] 
[resolve issue 2012: do not display target address with -o/-O
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101209110126
 Ignore-this: d8907a1009e3fbf1326bff2a6495eeff
] 
[Remove redundant import
Gabriel Kerneis <kerneis at pps.jussieu.fr>**20101209004214
 Ignore-this: c3112a5d0e7fe0f87675b90a8daf077d
] 
[Update test for XML Schema with MIT header.
dixiecko at gmail.com**20110219131704
 Ignore-this: 72c92213020c566415352ac1bf0777d0
 Review comment from Eric.
] 
[Test darcs changes XML with XSD/xmllint.
dixiecko at gmail.com**20110210204641
 Ignore-this: 7926281808cf00736cdec3f4c03f9d50
] 
[Add inferred XML Schema for outputs.
dixiecko at gmail.com**20110210200831
 Ignore-this: c7cbc92261eb7740fb6503f065ba0b5c
] 
[fixup tests pulled from the 2.5 branch
Ganesh Sittampalam <ganesh at earth.li>**20110401143545
 Ignore-this: 2098f593a9ee22ab230e41c7864bb0d7
] 
[test that we can't add files inside case changed directories
Ganesh Sittampalam <ganesh at earth.li>**20110321073203
 Ignore-this: bb8d35ea42c10d1cdbefd0b165c32ce3
] 
[resolve conflicts between
Ganesh Sittampalam <ganesh at earth.li>**20110311192904
 Ignore-this: 64cd892aa810d621675d9872bd5cb40
 [Wed Nov 17 13:53:01 GMT Standard Time 2010  Guillaume Hoffmann <guillaumh at gmail.com>
   * remove the mysterious add --date-trick]
 and
 [Fri Mar 11 19:12:19 GMT Standard Time 2011  Ganesh Sittampalam <ganesh at earth.li>
   * resolve issue2049: explicitly check for parent dir when recording an add
   The underlying hashed-storage routine doesn't currently throw when the
   parent dir isn't present.]
] 
[resolve issue2049: explicitly check for parent dir when recording an add
Ganesh Sittampalam <ganesh at earth.li>**20110311191219
 Ignore-this: 402ab1bb566da16088950519f8174076
 The underlying hashed-storage routine doesn't currently throw when the
 parent dir isn't present.
] 
[test for issue2049
Ganesh Sittampalam <ganesh at earth.li>**20110310075812
 Ignore-this: 404834548fc8c94caafc8b88f5f2c9f8
 This test passes with darcs 2.4 but fails with 2.5
] 
[test harness: recommend .exe suffix on Windows
Ganesh Sittampalam <ganesh at earth.li>**20110218070834
 Ignore-this: c6f3c9335672abe0674bcd2961ac568b
] 
[bump parsec dependency
Ganesh Sittampalam <ganesh at earth.li>**20110307115349
 Ignore-this: 95dc95be994d01d82df5a4216e350613
] 
[Unify hashed-storage version dependencies that caused a build fail.
Owen Stephens <darcs at owenstephens.co.uk>**20110331123341
 Ignore-this: 4e37fbf908b11fbc90836917549fa006
] 
[update website for 2.5.2
Ganesh Sittampalam <ganesh at earth.li>**20110314003110
 Ignore-this: 6c98ead551951aab0747dd003d4868dd
] 
[manual: reduce parts of it and remove use of first person
Guillaume Hoffmann <guillaumh at gmail.com>**20110306203853
 Ignore-this: 3133934cd7cfe6639a984895bc64fe97
] 
[manual: sort commands, add fetch and put convert last with info on formats
Guillaume Hoffmann <guillaumh at gmail.com>**20110306203551
 Ignore-this: 12a5d9eab8d598aad73618c6ed5a6177
] 
[manual: better pdf by reducing margins and making it one-sided
Guillaume Hoffmann <guillaumh at gmail.com>**20110306171110
 Ignore-this: 5d64af24586ce738494509c21ab53a22
] 
[manual: no longer include theory of patches appendix
Guillaume Hoffmann <guillaumh at gmail.com>**20110306170647
 Ignore-this: 4efdf663662af5da132608d57e9ba7d5
] 
[no longer generate a postscript manual
Guillaume Hoffmann <guillaumh at gmail.com>**20110306104156
 Ignore-this: 1b26d036c16afbb2a8ab51c8f693a6b4
] 
[manual: remove out of place gzcrcs flags
Guillaume Hoffmann <guillaumh at gmail.com>**20110304091720
 Ignore-this: 25f974d8d7d093f919efa36aed62ad7f
] 
[Rewrite darcs diff help
Guillaume Hoffmann <guillaumh at gmail.com>**20110304142030
 Ignore-this: efa301de6a6bb7ec4e1190571811192d
 Based on an initial patch by Trent W. Buck and Eric Kow's input.
 
] 
[bump QuickCheck and associated deps to fix build problem
Ganesh Sittampalam <ganesh at earth.li>**20110224212313
 Ignore-this: ca4053582bb0cf4340730765dfd5b0c1
] 
[put repair implementation in Darcs.Commands.Check
Guillaume Hoffmann <guillaumh at gmail.com>**20110223131348
 Ignore-this: 7bf1f933717b30028ba117d7e67abefa
] 
[test for get, pull and send support for OF repos
Guillaume Hoffmann <guillaumh at gmail.com>**20110223115927
 Ignore-this: f3b834727496688103730ddff82d2a34
] 
[resolve issue1737: darcs mv does not warn when moving old to new if > 2 args
bsrkaditya at gmail.com**20110222190956
 Ignore-this: acb803e02ad9cbf10a835f3c187a92a2
] 
[haddock for doesDirectoryReallyExist
Guillaume Hoffmann <guillaumh at gmail.com>**20110222153134
 Ignore-this: d9019e5349b7384f43853801bcc5a752
] 
[Add invert-rollback and effect-preserving properties
Iago Abal <iago.abal at gmail.com>**20110220005303
 Ignore-this: 2b3e8d694b8ea0a97505c9ec7440dc0c
] 
[Add testing properties for V1 Prim patches
Iago Abal <iago.abal at gmail.com>**20110216194538
 Ignore-this: 6d393f77673a166e53a8a50cc97af30b
   - Darcs.Test.Patch.Prim.V1 indirectly depends on tar package,
     so tar had to be added to darcs-test dependencies.
   - There is an small mess in Darcs.Test.Patch.Properties caused by
     two RepoModel definitions, but this will be refactored later.
] 
[Improved generators for V1 Prim patches
Iago Abal <iago.abal at gmail.com>**20110216191016
 Ignore-this: 16f6c03a86923c74fe6e3e40d9c34bce
 NB: Module Darcs.Test.Patch.WithState introduces some code duplication
 that will be removed later by some refactoring patches.
] 
[Add Darcs.Test.Patch.RepoModel
Iago Abal <iago.abal at gmail.com>**20110216181455
 Ignore-this: cdffe8d40098b0b5acdf2ae7ec9cfc1d
 Repository model for testing purposes, allowing things like 
 in-memory patch application.
] 
[Clarify comment
Iago Abal <iago.abal at gmail.com>**20110216171334
 Ignore-this: e3ad1e09d4c690a51cdc3093c336016d
] 
[Remove unused import
Iago Abal <iago.abal at gmail.com>**20110215183057
 Ignore-this: 1a39476af06b0df0c892841296aa3e1a
 The referred Eq Patch instance (see patch details) is not longer defined
 in Darcs.Test.Patch.Test so the import became useless.
] 
[Add Darcs.Test.Util.QuickCheck containing some auxiliary QuickCheck generators and combinators
Iago Abal <iago.abal at gmail.com>**20110215163945
 Ignore-this: f3e686d7c4eed39ec15f4ba55200bc62
] 
["Fix" the increase in test execution time
Iago Abal <iago.abal at gmail.com>**20110215160615
 Ignore-this: 65d7ef7f389020d5dd8984d0277c70f6
 Just set a limit for the number of discarded tests,
 causing execution of fewer tests for those properties with
 requirements that are hard to fulfil.
] 
[Remove useless MonadError contraint in Readable/WriteableRepository TreeMonad instances
Iago Abal <iago.abal at gmail.com>**20110215135357
 Ignore-this: 4b5c23adcd33efa39f60b15a9f5fdbad
 That constraint comes from previous versions of hashed-storage and was inherited by Darcs.
 Solved in hashed-storage 0.5.5 this contraint can also be removed from Darcs, requiring
 hashed-storage >=0.5.5.
] 
[Fix backslash escaping in my APPDATA patch.
Eric Kow <kowey at darcs.net>**20101130150343
 Ignore-this: 2664c25f33756a19b5ed8855de371e89
] 
[(Dirty) Fix of hpc.README for automatic generation of coverage report
Iago Abal <iago.abal at gmail.com>**20110218193755
 Ignore-this: 5194eeb267fc91dc459bae63d364cda
   - A report is generated for both shell (network included) and unit tests.
   - The use of hpc-sum could be replaced by the use of HPCTIXFILE.
] 
[Add -fhpc to darcs-test
Iago Abal <iago.abal at gmail.com>**20110216163907
 Ignore-this: d7c6b028514a2d4b0526c35f45840e85
 -fhpc should be passed to GHC when hpc flag is provided to cabal
 in order to obtain coverage information for unit tests.
] 
[Fix darcs-test on Win32 + GHC 6.12+.
Petr Rockai <me at mornfall.net>**20101121174348
 Ignore-this: b73beefe16f66da50bcef5491c11ed6b
] 
[remove bench dir since benchmarks have been externalised
Guillaume Hoffmann <guillaumh at gmail.com>**20110215223729
 Ignore-this: 7c63f356e903b4bc90c874ca0f87b97c
] 
[remove unused stringify.hs
Guillaume Hoffmann <guillaumh at gmail.com>**20110215113824
 Ignore-this: 949a572c758f2996927033143642177f
] 
[move manual .tex files from src to doc/src
Guillaume Hoffmann <guillaumh at gmail.com>**20110215111758
 Ignore-this: ebdc2b76a3728bcd5d70a08c2df6739e
] 
[remove irrelevant microbench.hs
Guillaume Hoffmann <guillaumh at gmail.com>**20110215110416
 Ignore-this: dbf0209b65f1f799ac666363e6f5e340
] 
[get rid of literate haskell for commands
Guillaume Hoffmann <guillaumh at gmail.com>**20110215004458
 Ignore-this: 82906f94777a3b17c2267fd7dce4297e
] 
[get rid of literate haskell for GZCRCs and TransferMode
Guillaume Hoffmann <guillaumh at gmail.com>**20110215004046
 Ignore-this: 8455044a1c7afc282c4a719fd4a556c4
] 
[move some literate haskell into theory_of_patches.tex
Guillaume Hoffmann <guillaumh at gmail.com>**20110214215211
 Ignore-this: 35604788433116f83ee68ef7f03b7fc2
] 
[inline manual parts of configuring_darcs.tex
Guillaume Hoffmann <guillaumh at gmail.com>**20110214214803
 Ignore-this: 39d939f9e4afb4fd019666e153d3c194
] 
[no longer build patch-theory manual file
Guillaume Hoffmann <guillaumh at gmail.com>**20110209171620
 Ignore-this: 1913f56819731b71a325faed652a7c37
] 
[inline manual part of darcs.tex up to arguments
Guillaume Hoffmann <guillaumh at gmail.com>**20110208190410
 Ignore-this: 27aed3416c18cfe230985dd6bab43178
] 
[tar on mingw seems to think c: introduces an ssh path
Ganesh Sittampalam <ganesh at earth.li>**20110214220707
 Ignore-this: 36805cc6976866cfd96d5099a52cfa14
] 
[Darcs.Witnesses.Sealed: add trailing newline to silence compiler warning
Ganesh Sittampalam <ganesh at earth.li>**20110207202715
 Ignore-this: 570e9c64c89f3723a2276a7620154cef
 (the warning only appears on Windows for some reason)
] 
[Darcs.URL: missing newline at end of file
Ganesh Sittampalam <ganesh at earth.li>**20110202180916
 Ignore-this: ca5a3c1aaec9c10911038f7171737f84
] 
[Darcs.Patch.Bracketed: missing newline at end of file
Ganesh Sittampalam <ganesh at earth.li>**20110202180900
 Ignore-this: 5d6dcdf17abf881b261f837104909311
] 
[Darcs.Patch.Bracketed.Instances: missing newline at end of file
Ganesh Sittampalam <ganesh at earth.li>**20110202180847
 Ignore-this: a762848e0f0012437f5190510cee94eb
] 
[Darcs.Patch.Dummy: missing newline at end of file
Ganesh Sittampalam <ganesh at earth.li>**20110202180834
 Ignore-this: f0eb4d12bb885bc69746d62d2df7344d
] 
[Darcs.Witnesses.Ordered: missing newline at end of file
Ganesh Sittampalam <ganesh at earth.li>**20110202071738
 Ignore-this: d3abbe6c909cbd9226179629307e7c76
] 
[Darcs.Witnesses.Eq: missing newline at end of file
Ganesh Sittampalam <ganesh at earth.li>**20110202071720
 Ignore-this: 636fd48c2e7e3b44fe696aeae92efafc
] 
[Darcs.Repository.LowLevel: missing newline at end of file
Ganesh Sittampalam <ganesh at earth.li>**20110202071707
 Ignore-this: e27a5e13cc3037dbce09048e9e6d20bb
] 
[Darcs.Patch.Prim.V1: missing newline at EOF
Ganesh Sittampalam <ganesh at earth.li>**20110202071641
 Ignore-this: aab06507ef5e949d460626cf4a4c8c3b
] 
[Add Darcs.Commands.Util to darcs.cabal
Alexey Levan <exlevan at gmail.com>**20110212004337
 Ignore-this: fad529599e00972dfaf85293b8df1f40
] 
[Maybefy lists in patch selection code
Alexey Levan <exlevan at gmail.com>**20110209013427
 Ignore-this: 92e6f756277f856bd7a87ce7cea6c774
] 
[Move commonly used functions from (Darcs.Command.)WhatsNew to Util
Alexey Levan <exlevan at gmail.com>**20110209012618
 Ignore-this: effff092d989864eb8346019ce98fbd3
] 
[Add Darcs.Test.Util.TestResult module to darcs.cabal
Iago Abal <iago.abal at gmail.com>**20110212004532
 Ignore-this: fcae2c9cdd4d085b7f0030ea9fe65e3f
 This module was added by the patch
   Fri Feb 11 12:47:19 WET 2011  Iago Abal <iago.abal at gmail.com>
     * Add TestResult data type and related utilities
 but I forgot to add it to the cabal file.
] 
[Replace use of Maybe Doc by TestResult in unit testing code
Iago Abal <iago.abal at gmail.com>**20110211130556
 Ignore-this: 55838705ff7ca165dfee6a21c53cc796
 This patch fixes a problem in QuickCheck testing code which causes
 QuickCheck to test a low number of interesting test cases.
  - QuickCheck generators generate only about 40% of interesting cases;
  - test properties made no use of the ==> operator so useless cases
    are considered as good ones;
  - but those test properties should be general enough to be tested by
    different tools like QuickCheck and HUnit.
 The introduction of TestResult aims to solve all these problems, but
 (as expected) it causes unit tests to take longer time to run.
] 
[Add TestResult data type and related utilities
Iago Abal <iago.abal at gmail.com>**20110211124719
 Ignore-this: 6596269ed6196dfb9a8b312c2893b0b
 TestResult (inspired in QuickCheck Result) considers three possible
 test results: a test may succeeds, fails, or (the new thing) be rejected.
 A rejected test case is a succeed but useless one, and expresses the desire
 to discard that test case and generate a new one, which is exactly what is
 done in case of a TestResult property being tested by QuickCheck.
 This data type aims to replace most uses of Maybe Doc in unit-testing code.
] 
[Fix arbitraryTree frequencies to significantly reduce empty trees
Iago Abal <iago.abal at gmail.com>**20110206161642
 Ignore-this: 473969fc9e78b5f4f52a84bf515b9e02
] 
[Warn about the use of localIdentity for testing
Iago Abal <iago.abal at gmail.com>**20110206133139
 Ignore-this: 3d4065b85bebfb67a991d236721c110e
] 
[Fix ArbitraryStateIn s (Tree p) instance to avoid generation of a (non-senseful) initial sequence of empty trees
Iago Abal <iago.abal at gmail.com>**20110206132224
 Ignore-this: fc74e01df9ef173c67caa24cea2e59bc
] 
[Fix bug in arbitraryTree causing it to break depth(result) <= maxDepth postcondition
Iago Abal <iago.abal at gmail.com>**20110206123342
 Ignore-this: da4e527df3bc89280355828aa6d1df2a
] 
[Add defaultToks to the export list of Darcs.Commands.Replace
Iago Abal <iago.abal at gmail.com>**20110206122916
 Ignore-this: 594992835624de7265c0f20258279420
 defaultToks will be used to create a QuickCheck generator for TokReplace patches
 and it is desirable to reuse this definition to avoid code duplication.
] 
[Clarify a commentary on commuteFiledir
Iago Abal <iago.abal at gmail.com>**20110106140622
 Ignore-this: ae8d2f3b8e2e3926d39cf3f83a18af4
] 
[Remove trailing space
Iago Abal <iago.abal at gmail.com>**20110106135704
 Ignore-this: b22f530d27920a1c4fd8168083e6ec0a
] 
[Resolve issue2041: prevent Darcs from following the directory symlinks
Alexey Levan**20110209221947
 Ignore-this: fa39fd362b60b159d3361b86f13e9bd5
] 
[Test for issue2041
Alexey Levan**20110209221720
 Ignore-this: 5e03a1c9d925e3e9642db8a1af3267
] 
[remove OF write support
Guillaume Hoffmann <guillaumh at gmail.com>**20110202160336
 Ignore-this: 35e0c1a4c01fa06694889978c305f6bf
 Make low level pristine handling functions fail on OF repository
 by printing an error message.
 Adapted from work by Petr Rockai
] 
[test that OF disabled commands are disabled
Guillaume Hoffmann <guillaumh at gmail.com>**20110202154403
 Ignore-this: 1313c518dd2fa4a5fb588c89dae3d4b9
] 
[update v1-braced.sh test to hashed format
Guillaume Hoffmann <guillaumh at gmail.com>**20110202152405
 Ignore-this: 8d1e7ec1aa2b14cc00a0a22f360d1de7
] 
[don't bother with testing issue1232
Guillaume Hoffmann <guillaumh at gmail.com>**20110202150638
 Ignore-this: d15573e9eb2653a3bbd1b16ec13270b0
 fixing the test would imply adding another OF repo archive with prefs
] 
[add amInHashedRepository to disable OF-deprecated commands at the UI level
Guillaume Hoffmann <guillaumh at gmail.com>**20110202142204
 Ignore-this: feba27fd4895b6e1f10ac56848865d4f
] 
[remove some --hashed and --old flags from tests
Guillaume Hoffmann <guillaumh at gmail.com>**20110122181816
 Ignore-this: dccfdcc51bc30f28627aacf85ad82671
] 
[modernize issue1984 test (patch by Petr Rockai)
Guillaume Hoffmann <guillaumh at gmail.com>**20110122174656
 Ignore-this: a19e7ae48dc3ed8afcca6c2949df42d4
] 
[Remove parts of the hashed_inventory that require conversion to OF.
Petr Rockai <me at mornfall.net>**20100829175818
 Ignore-this: bc8928771f8cd3a12bab69ffcf300362
] 
[Adapt issue1248 test to current OF-less situation.
Petr Rockai <me at mornfall.net>**20100829175750
 Ignore-this: a92ed0ef9be1b07bebcb6353c75ea160
] 
[Modernize the conflict-doppleganger test.
Petr Rockai <me at mornfall.net>**20100829171518
 Ignore-this: c8a728e17efb06e73b84395a59920e21
] 
[no longer test OF repositories
Guillaume Hoffmann <guillaumh at gmail.com>**20110121180658
 Ignore-this: 63d909879ed98b5b6f6990c8c70e86a3
] 
[remove --old flag for init get and put, modify help accordingly
Guillaume Hoffmann <guillaumh at gmail.com>**20110121173229
 Ignore-this: 51000442150d7318f302318070cb79cb
] 
[fix redundant import since not repairing when doing optimize --upgrade
Guillaume Hoffmann <guillaumh at gmail.com>**20101216112324
 Ignore-this: f712998161ae65f6a9bcc10d288f4aac
] 
[Do not try to replayRepository in optimize --upgrade (redundant, broken).
Petr Rockai <me at mornfall.net>**20100902162024
 Ignore-this: 23708c48fb211dcd4a95ea147c1e4697
] 
[Correct comments in Patch.Depends
Florent Becker <florent.becker at ens-lyon.org>**20110114144049
 Ignore-this: be5e9d3fbe1ce722235d003f6d89f903
] 
[Haddock some of Darcs.Patch.Depends.
Eric Kow <kowey at darcs.net>**20101218114634
 Ignore-this: 47ea2ce3e5b6e3d4942c70c7a28721df
] 
[correct character literals
Ganesh Sittampalam <ganesh at earth.li>**20101203220936
 Ignore-this: 19065e2f0ab74d7a0ef104a7f4e36449
] 
[Fix inconsistency in documentation on Windows paths.
Eric Kow <kowey at darcs.net>**20101124094339
 Ignore-this: eb1a4700a1bed8676067c523c7f5bad2
] 
[test for behaviour if there is pristine corruption
Ganesh Sittampalam <ganesh at earth.li>**20101123181837
 Ignore-this: 7a66f8e9a87cd90cf77550ee3c1f8a2d
] 
[TAG 2.7.3
Ganesh Sittampalam <ganesh at earth.li>**20110214234454
 Ignore-this: b44142d0a73d5ead9deec24cd6fb22b1
] 
Patch bundle hash:
014f1954d6b4b6092e303a2e2e279ddbef72240c

----------
messages: 15088
nosy: lelegaifax
status: needs-screening
title: Test script against issue 2138

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/patch717>
__________________________________