darcs

Issue 151 pull (select) => Impossible case at PatchChoices.lhs:187 (1.0.6pre1)

Title pull (select) => Impossible case at PatchChoices.lhs:187 (1.0.6pre1)
Priority bug Status resolved
Milestone Resolved in
Superseder Nosy List darcs-devel, dmitry.kurochkin, kowey, markstos, thorkilnaur, tommy, zooko
Assigned To
Topics

Created on 2006-03-23.16:52:52 by zooko, last changed 2009-08-27.13:58:11 by admin.

Messages
msg577 (view) Author: zooko Date: 2006-03-23.16:52:47
darcs: bug in darcs!
Impossible case at PatchChoices.lhs:187 compiled 15:10:23 Mar  9 2006
Please report this to bugs@darcs.net,
If possible include the output of 'darcs --exact-version'.

What I did was, darcs pull from the stable repo and there were 108 patches.  
I "j"'ed to the end, then "k'ed" my way backwards through all 108 of them.  On
each one I either did "y" or else did "w" followed by "k"'ing my way back up to
be above that one.  When I reached patch #1 and either "y"'ed or "w"'ed it,
then I "j"'ed back down to the end and then hit "w".

Regards,

Zooko

------- begin appended darcs --exact-version

darcs compiled on Mar  9 2006, at 15:14:59
# configured Thu Mar  9 15:02:50 AST 2006
./configure --prefix=/usr/local/stow/darcs-1.0.6 --no-create --no-recursion

Context:

[Fix mistyped /dev/null, fixes --sendmail-command in Windows
Esa Ilari Vuokko <ei@vuokko.info>**20051129160120] 

[Use \ as path separator for GnuPG in Windows -- makes apply --verify work
Esa Ilari Vuokko <ei@vuokko.info>**20051129164533] 

[make dangers and recommended use of "Amend" clearer in the docs.
Mark Stosberg <mark@summersault.com>**20051213140523

 I think it's important to be clearer about when it's appropriate to use 'amend',
 so I moved some notes into the short and mid-length help texts.
] 

[update web page to reflect 1.0.5 as latest stable source.
Tommy Pettersson <ptp@lysator.liu.se>**20051213111137] 

[fix handling of absolute paths containing drive letters
Will <will@glozer.net>**20051208054737
 This fixes issue 47 where paths containing drive letters (i.e. on windows)
 are not treated as absolute paths.
] 

[bump version to 1.0.6pre1
Tommy Pettersson <ptp@lysator.liu.se>**20051208092839] 

[TAG 1.0.5
Tommy Pettersson <ptp@lysator.liu.se>**20051207112730] 

[add changelog entry
Tommy Pettersson <ptp@lysator.liu.se>**20051207112704] 

[bump version to 1.0.5
Tommy Pettersson <ptp@lysator.liu.se>**20051204161803] 

[TAG 1.0.5rc2
Tommy Pettersson <ptp@lysator.liu.se>**20051204152416] 

[add changelog entries
Tommy Pettersson <ptp@lysator.liu.se>**20051204151312] 

[bump version to 1.0.5rc2
Tommy Pettersson <ptp@lysator.liu.se>**20051204150926] 

[skip tests that fail because of windows or msys
Will <will@glozer.net>**20051204035855] 

[use autoconf to determine which GHC modules to use
Will <will@glozer.net>**20051204022613
 GNUmakefile had the util and text packages hard coded, but the util package
 appears to be missing from the current ghc-6-4-branch.  Instead of hard
 coding packages, use autoconf to include them when necessary.
] 

[use System.Posix.sleep and fix the win32 implementation
Will <will@glozer.net>**20051204002859
 Make Lock.lhs use the sleep function from System.Posix rather than importing
 the C implementation.  Also fix the the win32 implementation to call SleepEx
 rather than sleep from unistd.h which has been deprecated in recent versions
 of mingw.
] 

[Make --help and --list-commands ignore other options
kow@loria.fr**20051204001207
 Proposed implementation of issue34 on the wishlist.

 If --help is one of the options you provide, then darcs prints
 the help and does nothing else, no matter what order you put
 the options in.  Similar behaviour for --list-commands.

] 

[Make send --ouput - to print to stdout
Esa Ilari Vuokko <ei@vuokko.info>**20051129201708] 

[Support apply --verify for bundles signed by GnuPG in Windows
Esa Ilari Vuokko <ei@vuokko.info>**20051126223238] 

[add Alberto Bertogli's ann2ascii tool
zooko@zooko.com**20051201150014] 

[TAG 1.0.5rc1
Tommy Pettersson <ptp@lysator.liu.se>**20051125191739] 

[add some changelog entries
Tommy Pettersson <ptp@lysator.liu.se>**20051125191633] 

[remove tabs from darcs source file
Tommy Pettersson <ptp@lysator.liu.se>**20051120200002] 

[Added a test for changes --context patch selection.
Daniel Bünzli <daniel.buenzli@epfl.ch>**20051120170157] 

[Emacs ediff-merge example and explanation of --external-merge.
Dave Love <fx@gnu.org>**20051117154924] 

[Fix patch selection for command changes --context
Daniel Bünzli <daniel.buenzli@epfl.ch>**20051117145112] 

[fix bug in amInRepository.
David Roundy <droundy@darcs.net>**20051117131208
 This is the bug that causes issue9.  I'm a bit uncertain about this
 patch--it looks obvious, but this is pretty subtle code.
] 

[fix bug where darcs tries to delete open tempfile on win32
Will <will@glozer.net>**20051117023516] 

[bump version to 1.0.5rc1
Tommy Pettersson <ptp@lysator.liu.se>**20051117111128] 

[Fixed documentation of DARCS_GET_HTTP with curl.
Daniel Bünzli <daniel.buenzli@epfl.ch>**20051117062547] 

[add --dont-edit-description opposite to --edit-description.
David Roundy <droundy@darcs.net>**20051116115632] 

[Flag superfluous input using Test::Builder
Florian Weimer <fw@deneb.enyo.de>**20051112160533

 This change makes sure that the test case that triggers this error
 condition fails in a clean way (especially if test planning is not used,
 but it should work with plans as well).
] 

[English and markup fixes.
Dave Love <fx@gnu.org>**20051114224845] 

[update web page to reflect 1.0.4 as latest stable source.
David Roundy <droundy@darcs.net>**20051113210144] 

[TAG 1.0.4
David Roundy <droundy@darcs.net>**20051113134431] 

[bump version number to 1.0.4.
David Roundy <droundy@darcs.net>**20051112170053] 

[fix, move default markings of Query Manifest flags right
Tommy Pettersson <ptp@lysator.liu.se>**20051112185325
 Files are included and dirs are not, by default.
] 

[make determine_release_state.pl work properly for actual releases.
David Roundy <droundy@darcs.net>**20051112171734] 

[add note in docs about bug with DARCS_DONT_ESCAPE_ISPRINT with GHC 6.4
Tommy Pettersson <ptp@lysator.liu.se>**20051112153628] 

[set DARCS_EDITOR in send.sh so darcs won't actually call a real editor.
David Roundy <droundy@darcs.net>**20051112145118] 

[Add BUGS section.
Dave Love <fx@gnu.org>**20051112135212
 The info should also be added to the manual somewhere appropriate.
] 

[Add bug address to help text.
Dave Love <fx@gnu.org>**20051112105924] 

[fix bug in darcs_completion when you match the "." character.
David Roundy <droundy@darcs.net>**20051112140357] 

[add a few more changelog entries.
David Roundy <droundy@darcs.net>**20051111133638] 

[fix bug in code for external conflict resolution.
David Roundy <droundy@darcs.net>**20051111132557] 

[spelling fix in docs.
David Roundy <droundy@darcs.net>**20051111123035] 

[use substrPS for more robust searching for the patch bundle hash.
David Roundy <droundy@darcs.net>**20051110145918] 

[speed up replace by first checking on each line if there might be a match.
David Roundy <droundy@darcs.net>**20051110143047
 The idea is that if there is no substring match, there won't be a token
 match, and we can save huge amounts of time.  On my very simple test
 (replacing if with fi in all of darcs' files), the speedup took us from 30
 seconds to 3 seconds to pull.
] 

[implement FastPackedString.substrPS, which searches for a substring.
David Roundy <droundy@darcs.net>**20051110140311] 

[make pull.pl work on MacOS X using ugly hack.
droundy@abridgegame.org**20051109131645
 For some reason ghc on MacOX X gives an Unknown error 0 where it ought to
 give a "permission denied" error.  This change just makes us recognize this
 and turns the test failure into a TODO check.
] 

[add a couple of changelog entries.
David Roundy <droundy@darcs.net>**20051108132617] 

[make sftp honor the SSH_PORT env variable.
David Roundy <droundy@darcs.net>**20051108131847] 

[Fix spurious failure of the revert test case
Florian Weimer <fw@deneb.enyo.de>**20051107195237

 "darcs revert -a" does not require confirmation.
] 

[Check for excess input in test cases
Florian Weimer <fw@deneb.enyo.de>**20051107195045

 This change also fixes a latent race condition (by adding a call to
 waitpid): darcs might not have run to completion when echo_to_darcs
 returns.
] 

[During tests, do not exit silently when a write fails
Florian Weimer <fw@deneb.enyo.de>**20051107194913] 

[Avoid putting a wrongly-named directory in dist tarball if the name we wanted already exists in $TMPDIR
Simon McVittie <http://www.pseudorandom.co.uk/>**20051106145821] 

[fix example in doc to work with version 1.0.3 and above
Tommy Pettersson <ptp@lysator.liu.se>**20051106232940
 Discovered and fix suggested by Pavel Pisa.
] 

[update version number to 1.0.4rc3.
David Roundy <droundy@darcs.net>**20051108120613] 

[TAG 1.0.4rc2
David Roundy <droundy@darcs.net>**20051106121631] 

[rewrite hunk application code to reinstate consistency checking.
David Roundy <droundy@darcs.net>**20051105190307
 In the optimization, Ian dropped checking that the "old" state of the file
 matches what the patch thinks.  This works fine until a repository becomes
 corrupt, at which point it makes the corruption harder to pinpoint (and
 makes it able to sneak by longer without being seen).
] 

[mark as TODO a merge bug that was uncovered by another bugfix.
David Roundy <droundy@darcs.net>**20051105184800
 This doesn't look like a pleasant bug, but the fix is a real fix, which I
 want to get into the stable release.
] 

[add test for newlineless patches.
David Roundy <droundy@darcs.net>**20051105171242] 

[fix bug in record --ask-deps
David Roundy <droundy@darcs.net>**20051103014858
 This fixes the "pull_firsts_middles called badly" bug.  It's a bit of an
 ugly hack to work around the Ian's ugly hack that makes:
 $ echo a | darcs record -m foo
 as memory-efficient (and time-efficient, too) as
 $ darcs record --all -m foo
 I do have some ideas how we might be able to avoid some of this
 ugliness...
] 

[add changelog entry for RT#476 bugfix.
David Roundy <droundy@darcs.net>**20051102145144] 

[Implement caching of git sequences in GitRepo.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051031132139] 

[Reorganized command overview in manual.
dbindner@truman.edu**20051029153655] 

[Remove obsolete comment.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051027183940] 

[Use gitCommitDatePS instead of gitCommitDate when choosing Git ancestors.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051027182421] 

[Use PackedStrings when parsing Git authors.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051027182400] 

[Use the new breakFirstPairPS instead of break2PS.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051027180138] 

[Change breakFirstPairPS to return slightly larger strings.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051027180107] 

[properly quote paths so that paths with spaces in them are okay
zooko@zooko.com**20051121195057] 

[fix up debug printouts in cygwin-wrapper.bash
zooko@zooko.com**20051115011712] 

[smoother invocation of cygwin-wrapper.bash -- it detects fully-qualified path to itself by leading /
zooko@zooko.com**20051115011702] 

[Use packed strings when parsing Git commits.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051026005323] 

[Implement break2PS.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051026005236] 

[Choose better ancestors for Git merges.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051025215522
 The common ancestor will be chosen optimally assuming that the Git
 ancestry graph is a semilattice and commit dates are monotonic.  If
 the Git ancestry graph is unstructured, the youngest ancestor will
 be chosen.

 If Git dates are not ordered, all bets are off.

 The algorithm is at least O(h*w^2), where h is the height of the
 ancestry graph and w is the number of ancestors, but profiling shows
 that this doesn't matter much -- commuting patches is what takes all
 the time.
] 

[Implement gitCommitDate.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051025213832] 

[Clarify docs for building darcs-git.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051025231344] 

[give better error messages when cloning trees
David Roundy <droundy@darcs.net>**20051020124139
 Also make cloneSubTree ignore nonexistent objects.  I belive this solves
 the issue with bug #562.
] 

[fix html package inclusion in user manual
Andres Loeh <loeh@iai.uni-bonn.de>**20051013200817] 

[improve command-line help for put.
David Roundy <droundy@darcs.net>**20051014115911] 

[add warning to docs about inefficiency of put.
David Roundy <droundy@darcs.net>**20051013124058] 

[add the new put command to list in doc
Tommy Pettersson <ptp@lysator.liu.se>**20051013103518] 

[update documentation on matching ranges
Tommy Pettersson <ptp@lysator.liu.se>**20051012163804
 The matching patch at either end of a range is included in the output.
] 

[document DARCS_DONT_ESCAPE_TRAILING_CR
Tommy Pettersson <ptp@lysator.liu.se>**20051012140458] 

[fix typo
Tommy Pettersson <ptp@lysator.liu.se>**20051010190733] 

[avoid duplicated code for constructing patch bundles in Push.
David Roundy <droundy@darcs.net>**20051011123752] 

[remove *.ko files from the default boring regexps.
David Roundy <droundy@darcs.net>**20051011131624
 They could be Korean translations rather than kernel modules.
] 

[add changelog entry for #544.
David Roundy <droundy@darcs.net>**20051009115143] 

[fix bug #544, caused by outputing changes --context with escaping and coloring.
David Roundy <droundy@darcs.net>**20051009114941] 

[add test for bug #544
David Roundy <droundy@darcs.net>**20051009114914] 

[bump version to 1.0.4rc2
Tommy Pettersson <ptp@lysator.liu.se>**20051010164926] 

[TAG 1.0.4rc1
Tommy Pettersson <ptp@lysator.liu.se>**20051008101653] 

[remove old footnote that caused doc-building trouble.
David Roundy <droundy@darcs.net>**20051008002612] 

[specify default --author in whatsnew.pl.
David Roundy <droundy@darcs.net>**20051007235714] 

[use prefix and userchunkPS in coolContextHunk
Tommy Pettersson <ptp@lysator.liu.se>**20050923093032
 This makes escaping of trailing spaces work in unified output.
] 

[add changelog entry for bug #512.
David Roundy <droundy@darcs.net>**20051007123717] 

[make --summary have effect in interactive commands
David Roundy <droundy@darcs.net>**20051007123507] 

[make --dry-run --summary indent the summaries like changes does.
David Roundy <droundy@darcs.net>**20051007123427] 

[Fix typos in description of unpull.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20051006204813
 Thanks to frithjof.
] 

[avoid excess printing in set_scripts_executable.pl.
David Roundy <droundy@darcs.net>**20051007112545] 

[fix documentation typos
Andres Loeh <loeh@iai.uni-bonn.de>**20050918175732] 

[description environment for explanation of --summary flags
Andres Loeh <loeh@iai.uni-bonn.de>**20050918175612] 

[remove/change/fix some quotation marks
Andres Loeh <loeh@iai.uni-bonn.de>**20050918171105] 

[remove occurrences of \bf, \tt, and \em
Andres Loeh <loeh@iai.uni-bonn.de>**20050918170214] 

[fix bug in whatsnew on files without trailing newlines.
David Roundy <droundy@darcs.net>**20051004124355] 

[add test for whatsnew -s on file without newline.
David Roundy <droundy@darcs.net>**20050905123225] 

[fix bug in set_scripts_executable test, and related bug in apply.
David Roundy <droundy@darcs.net>**20051006111849] 

[clean up tests/set_scripts_executable.pl.
David Roundy <droundy@darcs.net>**20051004131951] 

[make --set-scripts-executable work once again.
David Roundy <droundy@darcs.net>**20051004131756] 

[add executable bit support to Readable/WriteableDirectory.
David Roundy <droundy@darcs.net>**20051003123240] 

[remove occurances of "'" that messed up my emacs coloring...
David Roundy <droundy@darcs.net>**20050919122443] 

[-add test script for --set-scripts-executable
Mark Stosberg <mark@summersault.com>**20050901015046

 It's currently failing because darcs is currently broken in this regard. I commented
 out a "TODO" test in case you want to make to this a TODO test until
 someone gets to it.
] 

[add two changelog entries.
David Roundy <droundy@darcs.net>**20051004132328] 

[update copyright dates.
David Roundy <droundy@darcs.net>**20051004131936] 

[only use ascii chars in quoted escapes of non-printable chars
Tommy Pettersson <ptp@lysator.liu.se>**20050920163959
 Haskell interprets Char as unicode regardless of the systems locale,
 so isPrint can't be used the way it was used to find suitable escape
 quotings.  Ascii fortunately is unicode, so the simple fix is to restrict
 escape quotings to only use (printable) ascii chars.
] 

[Installation doc readability fixes
Thomas Zander <zander@kde.org>**20050924163649] 

[simplify docs-- why "CVS" is in the boring file is self-evident.
Mark Stosberg <mark@summersault.com>**20050927131847] 

[add two new changelog entries.
David Roundy <droundy@darcs.net>**20050910110115] 

[fix bug in resolve.pl test.
David Roundy <droundy@darcs.net>**20050910103833] 

[Change an rm_rf to a cleanup in tests/disable.pl
Ian Lynagh <igloo@earth.li>**20050902024711] 

[make gzReadFileLazily close files sooner.
David Roundy <droundy@darcs.net>**20050827211253] 

[fix "No root path(s) specified at ..." testsuite problem.
David Roundy <droundy@darcs.net>**20050830121603] 

[add test that triggers "too many open files" bug.
David Roundy <droundy@darcs.net>**20050827192215
 We just need to pull over 1024 patches at once to trigger this bug on my
 linux system.
] 

[give better output on sftp errors.
David Roundy <droundy@darcs.net>**20050908125423] 

[make darcs not generate null binary patches when diffing.
David Roundy <droundy@darcs.net>**20050907125129] 

[make darcs able to eliminate null binary and hunk patches when coalescing.
David Roundy <droundy@darcs.net>**20050907125104] 

[add test that adding and removing binary files leaves no change.
David Roundy <droundy@darcs.net>**20050907122509] 

[fix some typos in comments
Conrad Parker <conrad@metadecks.org>**20050904225715] 

[Make print_dry_run_message_and_exit print summaries if All and Summary.
David Roundy <droundy@darcs.net>**20050904125434
 This is a somewhat hokey way to make --all --summary print summary
 messages.
] 

[add changelog entry for configure script checking on darcs being present.
David Roundy <droundy@darcs.net>**20050905113258] 

[fix bug where we tried to run darcs when darcs wasn't present.
David Roundy <droundy@darcs.net>**20050905112935] 

[revert accidental directory name change in Test.
David Roundy <droundy@darcs.net>**20050904123424] 

[fix bug triggered by --no-pristine-tree and running test.
David Roundy <droundy@darcs.net>**20050903132055
 The trouble was that the NoPristine version of createPristineDirectoryTree
 would fail if the directory already exists, which isn't the intended
 behavior.  I also took this opportunity to remove the "stubbornly" function
 and replace some stubborn directory creation with
 createDirectoryIfMissing.
] 

[don't create test directory if we don't want to actually run test.
David Roundy <droundy@darcs.net>**20050903130722] 

[add test script that displays --no-pristine test-related bug.
David Roundy <droundy@darcs.net>**20050903132906] 

[add changelog entry for recent pristine bugfix.
David Roundy <droundy@darcs.net>**20050903134039] 

[clean up docs on flags directly to darcs (not to a darcs command).
David Roundy <droundy@darcs.net>**20050903124050] 

[bump version to 1.0.4rc1.
David Roundy <droundy@darcs.net>**20050903114002] 

[update the web page to direct new users first to the precompiled binaries rather than first to the source
zooko@zooko.com**20050902162737] 

[TAG 1.0.4pre4
David Roundy <droundy@darcs.net>**20050901110418] 

[add changelog entry for makefile fix.
David Roundy <droundy@darcs.net>**20050901110353] 

[bump version to 1.0.4pre4.
David Roundy <droundy@darcs.net>**20050901110210] 

[fix DESTDIR syntax errors in makefile
Andres Loeh <loeh@iai.uni-bonn.de>**20050831192410] 

[TAG 1.0.4pre3
David Roundy <droundy@darcs.net>**20050831115448] 

[add two changelog entries.
David Roundy <droundy@darcs.net>**20050831113335] 

[only create directories on install if they don't exist (bug #494)
David Roundy <droundy@darcs.net>**20050831113142] 

[fix bug in whatsnew -l -l (rt#501).
David Roundy <droundy@darcs.net>**20050831110552] 

[fix typo in docs.
David Roundy <droundy@darcs.net>**20050831002520] 

[fix --posthook code to pass tests.
David Roundy <droundy@darcs.net>**20050830132225] 

[add test for --disable.
David Roundy <droundy@darcs.net>**20050830132122] 

[add changelog entry for --posthook.
David Roundy <droundy@darcs.net>**20050830132110] 

[add skeleton posthook test.
David Roundy <droundy@darcs.net>**20050827123744] 

[posthook documentation
Jason Dagit <dagit@codersbase.com>**20050825045706] 

[changed from --posthook-command to posthook
Jason Dagit <dagit@codersbase.com>**20050825043414] 

[now the posthook options appear for each command
Jason Dagit <dagit@codersbase.com>**20050825043305] 

[posthook for apply
Jason Dagit <dagit@codersbase.com>**20050803070343
 With this patch it is now possible to specify a command to run after every
 successful apply.
] 

[added run_posthook for actually running posthooks
Jason Dagit <dagit@codersbase.com>**20050803070156
 This adds the function run_posthook which should be used to run posthooks.
 The code was added to Test.lhs, but there may be a better place for this code.
] 

[added posthook command line switches
Jason Dagit <dagit@codersbase.com>**20050803065956
 Added generic posthook command line switches.  This patch does not add any
 posthooks to any command.
] 

[New implementation of comparePS, based on memcmp. 1/5 space usage, 96% faster
dons@cse.unsw.edu.au**20050827070030] 

[Rewrite gcau, add explanatory comment from David and some TODO notes
Ian Lynagh <igloo@earth.li>**20050830020943] 

[update building darcs section of manual.
David Roundy <droundy@darcs.net>**20050829120152] 

[add bench directory with a single script in it.
David Roundy <droundy@darcs.net>**20050828114118
 See bench/README for discussion of the idea behind this.
] 

[Use substrPS-less versions of initPS and tailPS
dons@cse.unsw.edu.au**20050827023214] 

[remove hideous malloc hack.
David Roundy <droundy@darcs.net>**20050818161411] 

[Remove unused function
Ian Lynagh <igloo@earth.li>**20050730010118] 

[fix for bug Ian found in apply.
David Roundy <droundy@abridgegame.org>**20050811162558
 This is the bug manifested in the cabal repository.
] 

[Move slurping into syncPristine.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050809232101
 Avoids creating a useless pristine tree when there is none.  Thanks to
 Ian for pointing this out.
] 

[Split --relink into --relink and --relink-pristine.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050809230951
 Relinking the pristine tree breaks handling of timestamps, which causes
 Darcs to compare file contents.  It should not be used unless you know
 what you are doing.
] 

[fix compilation errors with ghc-6.2.2 on win32
Peter Strand <peter@zarquon.se>**20050809192759] 

[Retain both Git's author and committer.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050810000820] 

[make repair work on partial repositories.
David Roundy <droundy@abridgegame.org>**20050805113001] 

[Cleanup --verbose handling in repair command
Matt Lavin <matt.lavin@gmail.com>**20050805020630] 

[change my AUTHORS email to droundy@darcs.net.
David Roundy <droundy@abridgegame.org>**20050808124703] 

[clean up Printer.wrap_text.
David Roundy <droundy@abridgegame.org>**20050808114844] 

[add several changelog entries.
David Roundy <droundy@abridgegame.org>**20050808114800] 

[improve EOD message a tad.
David Roundy <droundy@abridgegame.org>**20050807112644
 This change also introduces a "wrapped_text" function in Printer, so we
 won't have to worry so often about manually wrapping lines.
] 

[changed ***DARCS*** to ***END OF DESCRIPTION***
Jason Dagit <dagit@codersbase.com>**20050729032543] 

[remove unused opts argument from apply_patches and apply_patches_with_feedback
Matt Lavin <matt.lavin@gmail.com>**20050807031038] 

[Use apply_patch_with_feedback from check and repair commands
Matt Lavin <matt.lavin@gmail.com>**20050805020830] 

[add code to read patch bundles with added CRs.
David Roundy <droundy@abridgegame.org>**20050806222631
 I think this'll address bug #291.
] 

[accept command-line flags in any order.
David Roundy <droundy@abridgegame.org>**20050806211828
 In particular, we no longer require that --flags precede filename and
 repository arguments.
] 

[show patch numbers instead of dots on get
Matt Lavin <matt.lavin@gmail.com>**20050804013649] 

[add obliterate command as alias for unpull.
David Roundy <droundy@abridgegame.org>**20050804104929] 

[Do not ask confirmation for revert -a
jani@iv.ro**20050627124011
 Giving -a as a parameter means the user expects all changes to be reverted.
 Just like for unrevert and record go ahead with it do not ask for confirmation.
] 

[clarify help text for 'd' in SelectPatches.
David Roundy <droundy@abridgegame.org>**20050806231117] 

[Add --with-static-libs configure flag for linking static versions of libraries.
v.haisman@sh.cvut.cz**20050729015539] 

[add changelog entry for bug #477.
David Roundy <droundy@abridgegame.org>**20050806212148] 

[changelog entry for bug #189.
David Roundy <droundy@abridgegame.org>**20050731132624] 

[add description of how to add changelog entries to ChangeLog.README.
David Roundy <droundy@abridgegame.org>**20050806225901] 

[Explain the missing ChangeLog
Mark Stosberg <mark@summersault.com>**20050526135421

 It should be easy for casual users and contributors to view and update the
 ChangeLog.

 Providing a README file in the place where people are most likely to look
 provides a very useful clue.

 However, it's still not clear to me exactly how the system works, so I have
 left a stub to complete that documentation.

     Mark

] 

[fix obsolete error explanation in get_extra bug.
David Roundy <droundy@abridgegame.org>**20050804130610] 

[simplify fix for bug 463; reuse /// from FilePathUtils
Matt Lavin <matt.lavin@gmail.com>**20050804021130] 

[Make curl exit with error on failed downloads
peter@zarquon.se**20050802192833] 

[Bump up AC_PREREQ version to 2.59.
v.haisman@sh.cvut.cz**20050801173925] 

[fix for bug 463 (with new test)
Matt Lavin <matt.lavin@gmail.com>**20050802002116] 

[bump version number, since I just made a release.
David Roundy <droundy@abridgegame.org>**20050731190756] 

[Use simpler curl_version() function to get version string.
Kannan Goundan <kannan@cakoose.com>**20050322221027] 

[fix documentation on --reorder-patches.
David Roundy <droundy@abridgegame.org>**20050731185406] 

[add changelog entry for bug #224.
David Roundy <droundy@abridgegame.org>**20050731133942] 

[fix bug when editing long comment leaves empty file.
David Roundy <droundy@abridgegame.org>**20050731133612] 

[TAG 1.0.4pre2
David Roundy <droundy@abridgegame.org>**20050731121029] 

[add changelog entry and building darcsgit section to manual.
David Roundy <droundy@abridgegame.org>**20050731120458] 

[check for a git/ in current directory (when --enable-git).
David Roundy <droundy@abridgegame.org>**20050731112740] 

[remove the now-unneeded git/.
David Roundy <droundy@abridgegame.org>**20050731105656] 

[make determine_release_state.pl not touch ThisVersion.lhs unless it's changed.
David Roundy <droundy@abridgegame.org>**20050730193258
 This saves us considerable time checking whether anything needs to be
 recompiled.
] 

[Autoconf support for linking against libgit.a
Wim Lewis <wiml@hhhh.org>**20050731050341
 Allow (actually, require) the user to specify the location of the Git
 implementation when including Git support. Attempt to discover whether
 Git was compiled to require OpenSSL's implementation of SHA1.
] 

[Do autoconf substitution on git.h
Wim Lewis <wiml@hhhh.org>**20050731050259] 

[Use AS_HELP_STRING to format option descriptions
Wim Lewis <wiml@hhhh.org>**20050729185632] 

[Simplify curses/ncurses search; use $LIBS
Wim Lewis <wiml@hhhh.org>**20050729183440] 

[Changes for Git 0.99
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050730213601] 

[fix darcs --commands, which was broken by subcommand code.
David Roundy <droundy@abridgegame.org>**20050730111501] 

[Merge changes
Ian Lynagh <igloo@earth.li>**20050728230858] 

[Update QueryManifest with the Repository changes
Ian Lynagh <igloo@earth.li>**20050728185646] 

[Merge changes
Florian Weimer <fw@deneb.enyo.de>**20050607203225] 

[Test case for "query manifest"
Florian Weimer <fw@deneb.enyo.de>**20050510113803] 

[Remove the "query changes" and "query annotate" subcommands
Florian Weimer <fw@deneb.enyo.de>**20050510060221] 

[Do not mention file name in error message for disabled commands
Florian Weimer <fw@deneb.enyo.de>**20050510054931

 We have multiple configuration files, and we do not know tat this point which
 file contains the "disable" option.
] 

[Remove --disable on supercommands
Florian Weimer <fw@deneb.enyo.de>**20050510054744] 

[Resolve conflict
Florian Weimer <fw@deneb.enyo.de>**20050510054405] 

[Add --help in command_options, like --disable
Florian Weimer <fw@deneb.enyo.de>**20050510053348

 --list-options is still separate, to keep it undocumented.
] 

[Resolve conflict
Florian Weimer <fw@deneb.enyo.de>**20050510052119] 

[Move --disable to the end of the option list
Florian Weimer <fw@deneb.enyo.de>**20050510051905] 

[Include the query subcommand documentation in Query.lhs
Florian Weimer <fw@deneb.enyo.de>**20050510051533] 

[Print usage information if the subcommand is missing
Florian Weimer <fw@deneb.enyo.de>**20050509101427

 Add a separating line to the invalid subcommand error message.
] 

[Fix empty lines in "darcs query --help" output
Florian Weimer <fw@deneb.enyo.de>**20050509100509] 

[Resolve conflicts
Florian Weimer <fw@deneb.enyo.de>**20050509094729] 

[Add the --disable option in command_options, not in run_the_command
Florian Weimer <fw@deneb.enyo.de>**20050509093929

 This change makes it possible to specialize the list of default commands
 (such as --disable) on different DarcsCommand constructors.
] 

[Add --pending option to "query manifest"
Florian Weimer <fw@deneb.enyo.de>**20050508080502] 

[Add the --files and --directories options to "query manifest"
Florian Weimer <fw@deneb.enyo.de>**20050507223327] 

[Implement list_slurpy_dirs
Florian Weimer <fw@deneb.enyo.de>**20050507223257] 

[Add --null flag to the "query manifest" command
Florian Weimer <fw@deneb.enyo.de>**20050507213547] 

[Add "query manifest" command
Florian Weimer <fw@deneb.enyo.de>**20050507163125] 

[Implement the \haskell command for subcommands
Florian Weimer <fw@deneb.enyo.de>**20050507160607] 

[Mention the structure of subcommands in the documentation
Florian Weimer <fw@deneb.enyo.de>**20050507151003] 

[Handle subcommands in the preprocessor
Florian Weimer <fw@deneb.enyo.de>**20050507150829

 You can use "\options{SUPER SUB}" to document the options of a
 subcommand.
] 

[Do not include the "query" command in the manual
Florian Weimer <fw@deneb.enyo.de>**20050507150707

 The commands will be documented individually, in the relevant section.
] 

[Mention "query" subcommands in the man page
Florian Weimer <fw@deneb.enyo.de>**20050507135756

 "changes" is now documented as "query changes".  "query annotate" is
 mentioned, too.
] 

[add subcommand infrastructure and (currently useless) query command.
David Roundy <droundy@abridgegame.org>**20050507115457
 The idea of course is that this can be readily extended to add nice new
 simple subcommands under query.
] 

[share target collection code in send implementation
Matt Lavin <matt.lavin@gmail.com>**20050730212012] 

[Make send --to override default email and add test for it
Matt Lavin <matt.lavin@gmail.com>**20050730185352] 

[remove unused #define from windows flags.
David Roundy <droundy@abridgegame.org>**20050730124558] 

[Fix typo
Florian Weimer <fw@deneb.enyo.de>**20050510113824] 

[mention in changelog the win32 build improvement in recognizing windows.
David Roundy <droundy@abridgegame.org>**20050730124809] 

[use presence of windows.h to decide if we're in windows.
David Roundy <droundy@abridgegame.org>**20050730124536] 

[add new changelog entry and update older one.
David Roundy <droundy@abridgegame.org>**20050730115001] 

[fix bug introduced in 208 fix which messed up --list-options output.
David Roundy <droundy@abridgegame.org>**20050729121804
 We need to make sure that drop_paths doesn't do anything to an absolute
 path or URL.
] 

[Don't die on sigALRM (linking with -threaded means we see loads of them)
Ian Lynagh <igloo@earth.li>**20050728131023] 

[Give help for 'c' in selectchanges
Ian Lynagh <igloo@earth.li>**20050728125910] 

[Include autoconf-detected libs in LDFLAGS
Joshua J. Berry <condor-dev@condordes.net>**20050728031609
 Autoconf uses @LIBS@ -- not @LDFLAGS@ -- for libraries it detects (e.g. using
 AC_SEARCH_LIBS).
] 

[resolve conflict with myself...
David Roundy <droundy@abridgegame.org>**20050727100745] 

[fix pulling from a relative defaultrepo from within a subdirectory.
David Roundy <droundy@abridgegame.org>**20050722105708
 This is a fix for bug #208.  It is perhaps a tad more invasive than
 necesary, and introduces a FilePathUtils module that is perhaps
 overkill... especially since it doesn't do much.
] 

[Small tweaks to the with_new_pending patch
Ian Lynagh <igloo@earth.li>**20050727025308] 

[replace write_pending with "with_new_pending".
David Roundy <droundy@abridgegame.org>**20050722125725
 This patch is basically an extension of Ian's earlier patch that created a
 "write_pending_then" function.  This one creates two functions,
 with_new_pending and add_to_pending.

 The idea is that we can't check if a new pending is valid until after we've
 updated the pristine cache.  But it's possible that the pending patch
 itself was lazily generated with get_unrecorded, in which case it's not
 safe to modify the pristine cache until after we've written pending.  This
 new interface makes it much harder to make this kind of mistake.  I also
 think it's pretty intuitive.
] 

[Removed an unused reference to Slurpy
Ian Lynagh <igloo@earth.li>**20050709114603] 

[remove TODO annotation for two tests that now pass.
David Roundy <droundy@abridgegame.org>**20050728115034] 

[new changelog entries.
David Roundy <droundy@abridgegame.org>**20050726123329] 

[clean up formatting in Depends.
David Roundy <droundy@abridgegame.org>**20050723130807] 

[changelog entry for fix to RT#208.
David Roundy <droundy@abridgegame.org>**20050722113803] 

[make make_changelog a bit more flexible in its parsing.
David Roundy <droundy@abridgegame.org>**20050722113701
 One can now have blank lines between the match: lines and the actual
 comments.
] 

[give better error message when dealing with a non-repository.
David Roundy <droundy@abridgegame.org>**20050722105908] 

[make make_changelog ignore boring files (emacs backups) in changelog.in/entries/.
David Roundy <droundy@abridgegame.org>**20050726121455] 

[fix bug in get_patches_beyond_tag that broke get --partial.
David Roundy <droundy@abridgegame.org>**20050723125507
 The bug was that we sometimes looked at patches that weren't strictly
 necesary.  This was because of the concat in get_patches_beyond_tag, which
 loses information about tag dependencies.  A clean implementation of a
 get_extra that accepts a true PatchSet would be a nicer fix (since it might
 fix other similar problems), but this fix is also correct and simple.
] 

[add changelog entry for get --partial fix.
David Roundy <droundy@abridgegame.org>**20050723130715] 

[scrunch up the tla/cvs tables a bit in the manual.
David Roundy <droundy@abridgegame.org>**20050724181011] 

[another alternative formatting for cvs/tla tables.
Erik Schnetter <schnetter@aei.mpg.de>**20050724134656] 

[alternative formatting for cvs/tla tables.
Erik Schnetter <schnetter@aei.mpg.de>**20050724113905] 

[make add/remove --list-options not output preceding ./
David Roundy <droundy@abridgegame.org>**20050723134758
 We were treating the repository root differently from subdirectories
 because the file paths didn't need to get "fixed".  Addresses bug #158.
] 

[fix unit test that prompts for input
Will <will@glozer.net>**20050722181028] 

[Make DarcsRepo.add_to_inventory take a list.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050720174029
 This avoids opening the inventory multiple times.  Thanks to Ian for the hint.
] 

[Use mapM_ instead of the comprehensible alternative.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050720164258
 Mentioning mapM_ always impresses people at dinner parties.  Thanks to
 Ian for the hint.
] 

[Move iterateGitTree out of the IO monad.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050720162841
 We're reading immutable on-disk data, it's safe to do it unsafely.
] 

[Clean up usage of interleaveIO in Git.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050720162251] 

[fix write_problem to show all problems.
David Roundy <droundy@abridgegame.org>**20050717110628] 

[don't import head and tail, which are in the prelude.
David Roundy <droundy@abridgegame.org>**20050716143547] 

[Rename bound variable in fromJust macro.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050716221705
 Avoids ``shadows existing variable'' warnings which for some reason are
 errors.

 Could we please use Lisp macros instead?
] 

[TAG 2005-07-18
Ian Lynagh <igloo@earth.li>**20050718193534] 

[put configure.ac back in the public domain.
David Roundy <droundy@abridgegame.org>**20050720115702] 

[fix error in name of --reorder-patches flag.
David Roundy <droundy@abridgegame.org>**20050722110752] 

[Push and pull can now show the detailed diffs of patches
Jim Radford <radford@blackbean.org>**20050717042645
 The same distinction is now made between --summary and --verbose
 as changes makes.
] 

[advance DARCS_VERSION to 1.0.4pre2.
David Roundy <droundy@abridgegame.org>**20050720115536
 In the new tradition of changing the version after a release rather than
 before a release (although when the release type changes to rc or actual
 release it'll have to be done before the release).
] 

[drop $srcdir use; build-directories aren't supported anyway
Peter Simons <simons@cryp.to>**20050719140044] 

[clean generated manual files at realclean
Peter Simons <simons@cryp.to>**20050719135935] 

[cosmetic changes
Peter Simons <simons@cryp.to>**20050719135834] 

[move comment to the right place
Peter Simons <simons@cryp.to>**20050719135818] 

[let config.status generate config.command
Peter Simons <simons@cryp.to>**20050719135733] 

[make use of autoconf 2.5x's AC_INIT macro
Peter Simons <simons@cryp.to>**20050719135611] 

[use ./config.status to re-configure build after autoconf changes
Peter Simons <simons@cryp.to>**20050719135435] 

[update distclean and realclean targets
Peter Simons <simons@cryp.to>**20050719135415] 

[canonize simons@cryp.to
Peter Simons <simons@cryp.to>**20050719134834] 

[cosmetic change
Peter Simons <simons@cryp.to>**20050719134816] 

[update test suite to work with Peter's makefile changes.
David Roundy <droundy@abridgegame.org>**20050721102319] 

[TAG 1.0.4pre1
David Roundy <droundy@abridgegame.org>**20050718112234] 

[make configure automatically guess the release state based on defaultrepo and tags.
David Roundy <droundy@abridgegame.org>**20050718112222] 

[bugfix, make _darcs/prefs/defaults really override $HOME/.darcs/defaults
Tommy Pettersson <ptp@lysator.liu.se>**20050612174925
 Variants of the same flag from the two defaults files where just merged,
 and an ALL in the local defaults could not override an explicit command
 in the global defaults, as would be expected.
] 

[Keep file modes in dirty Git slurpies.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050716071846
 This prevents Darcs from resetting Git file permissions.
] 

[Update HEAD in place.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050716071116] 

[Generalise write_pending.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050716002145
 I missed this, which breaks add and remove.
] 

[Use emptyGitSlurpy in gitCommitToPatch'.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050715234115] 

[Fix parsing of Git merges with no common ancestor.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050715233226] 

[Implement emptyGitSlurpy.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050715233211] 

[Fix typo in applyF_direct (Git).
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050715233140] 

[Don't include ./ when generating patches from Git.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050715203248] 

[Generalise rollback.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050715194322] 

[Make histories that come from Git lazy in the presence of merges.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050715193440
 Use the fact that we know the length of the result of a merge to produce a
 spine-lazy list of patches.  This makes ``darcs changes'' never touch
 a blob.
] 

[Make darcs understand Git n-ary merges.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050715192333] 

[move read/write format checks into identifyRepository and withRepoLock.
David Roundy <droundy@abridgegame.org>**20050714105840] 

[cleanups in RepoFormat as suggested by Ian.
David Roundy <droundy@abridgegame.org>**20050711125711] 

[Generalise Pull and Apply.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050712145643] 

[Generate Git PatchInfos from scratch.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050712123945
 patchtopatchinfo is not lazy enough.
] 

[Replace frobPatchFile with patchTokenToPatchFile.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050711045246] 

[Make writing of patches work in arbitrary directories.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050711021014] 

[Use impossible.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050711015640] 

[Make patch tokens opaque.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050711014829] 

[fix typo in git prefsUrl.
David Roundy <droundy@abridgegame.org>**20050711100531] 

[generalize Revert and Unrevert.
David Roundy <droundy@abridgegame.org>**20050711100429] 

[fix bug where we failed to convert sha1 to hex.
David Roundy <droundy@abridgegame.org>**20050711092602] 

[use AC_SEARCH_LIBS instead of AC_CHECK_LIB
Wim Lewis <wiml@hhhh.org>**20050707181811] 

[Update AC_PREREQ to 2.54
Wim Lewis <wiml@hhhh.org>**20050707181631
 The form of AC_C_BIGENDIAN used here didn't show up until 2.53 or 2.54.
 Also, no need to specify the third arg, since it defaults to erroring out anyway.
] 

[Make record repository-format agnostic.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050710034630] 

[Implement polymorphic write support.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050710034310] 

[Make withRepoLock polymorphic.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050710023802] 

[Make writePatch and updateInventory polymorphic.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050710021543] 

[Make sync_repo polymorphic.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050710021426] 

[Import GitRepo from darcs-git.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050710015221
 This version has write support and support for reverse-engineering
 Darcs merges from Git merges.
] 

[Add ``lax'' argument to applyToGitSlurpy.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050710014814
 When lax is true, we apply merger_equivalent to mergers.
] 

[Make read/write_pending polymorphic.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050710012515] 

[TAG 2005-007-16
Ian Lynagh <igloo@earth.li>**20050716181541] 

[Fix make_changelog to work with David's new identifyRepository.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050710002419] 

[Fix typo in import of malloc.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050710001235] 

[Add comment about immutability of Git trees.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050709215815] 

[Fix location of HEAD in Git.updateHead.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050709215408] 

[implement missing DarcsIO methods in SlurpMonad.
David Roundy <droundy@abridgegame.org>**20050709192216] 

[clean up GitTreeIterator.
David Roundy <droundy@abridgegame.org>**20050709174440] 

[eliminate excess touching in Git.
David Roundy <droundy@abridgegame.org>**20050709170954] 

[make GitFileInfo a cleaner more haskellish data type.
David Roundy <droundy@abridgegame.org>**20050709170457] 

[add some typesafety to haskell cache_entry-related Git code.
David Roundy <droundy@abridgegame.org>**20050709153935] 

[add a bit of type safety to the pointers to git_tree_iterator.
David Roundy <droundy@abridgegame.org>**20050709153337] 

[make GitFile use the ffi more nicely.
David Roundy <droundy@abridgegame.org>**20050709152131] 

[replace fromSingleton with gitSingleCommitValue which gives better error message.
David Roundy <droundy@abridgegame.org>**20050709145616] 

[implement CString utility functions in FastPackedString.
David Roundy <droundy@abridgegame.org>**20050709145549] 

[use withSlurpy to implement apply_to_slurpy.
David Roundy <droundy@abridgegame.org>**20050709145517] 

[make darcs send look in the right place for target email address.
David Roundy <droundy@abridgegame.org>**20050709121505] 

[fix bug in Repository abstraction code that broke remote pulls.
David Roundy <droundy@abridgegame.org>**20050709120518
 This change adds to the Repository data object the URL of the repository in
 question, allowing us to use this abstraction with both remote and local
 repositories.
] 

[add support for repository format checking.
David Roundy <droundy@abridgegame.org>**20050709112017
 The idea being to be forward-compatible with repository format changes.
] 

[Only read darcs/cgi.conf once.
Wim Lewis <wiml@hhhh.org>**20050623081319
 Modified read_conf() so it caches the parsed configuration values
 in a hash, instead of re-opening and re-reading the configuration
 file several times per CGI invocation. (A probably-unimportant side
 effect of this is that flag names can no longer contain spaces, but
 that shouldn't affect anybody.)
] 

[Documentation nits & typos
Wim Lewis <wiml@hhhh.org>**20050618193852] 

[Revert an accidental Repository -> DarcsRepo change in a string
Ian Lynagh <igloo@earth.li>**20050707160431] 

[Revert "Cache pristine directory within NoPristine"
Ian Lynagh <igloo@earth.li>**20050707153500] 

[fixed a few typos in docs & comments
Wim Lewis <wiml@hhhh.org>**20050624070640] 

[make git support configurable (copied from Juliusz's patch).
David Roundy <droundy@abridgegame.org>**20050701135046] 

[TAG another version that works in the git-merge saga.
David Roundy <droundy@abridgegame.org>**20050701133252] 

[fix errors from merging more darcs-git stuff.
David Roundy <droundy@abridgegame.org>**20050701133228] 

[resolve some more conflicts.
David Roundy <droundy@abridgegame.org>**20050701132446] 

[TAG working version in middle of darcs-git merge.
David Roundy <droundy@abridgegame.org>**20050701125730] 

[resolve conflicts between git and darcs-unstable.
David Roundy <droundy@abridgegame.org>**20050701125706] 

[Cache pristine directory within NoPristine.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426172006] 

[eliminate unnecesary unsafePerformIOs in Git.
David Roundy <droundy@abridgegame.org>**20050701142312] 

[Move gitIsTree to C code.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050509235651] 

[Simplify gitBlobToPatches.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050509234445] 

[Remove obsolete comment.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050507195543] 

[Make ordering of trees Linus-compatible.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050507184412] 

[Don't sort when purifying Git slurpies.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050507024134
 The new ordering is preserved by purification.
] 

[Replace the definition of Ord on GitSlurpy with one that works.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050507023832
 This is still not Linus-compliant, as Haskell and C use different ordering
 conventions.
] 

[Fix typo in noname.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050506222328] 

[Make gitFooToPatches work with dirty trees.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050506200939] 

[Export GitSlurpy.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050506181048] 

[Implement a variant of gitCommitToPatch that takes a GitSlurpy reference.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050506180031] 

[Get rid of gitCommitToPIMP.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050505181603] 

[Move reading git commits out of the IO monad.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050505180609] 

[Simplify generation of PatchSets from Git repos.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050505170207] 

[Fix parsing of multiple parents in Git commits.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050505153025
 Multiple parents come in separate parent lines, not a single line as I
 thought.
] 

[Fix Git date handling.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504233745] 

[Fix formatting of Git files.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504211643] 

[Fix formatting of Git records.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504210607] 

[Only free those names that were allocated in git_write_tree_done.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504204933] 

[Free the right buffer in git_write_tree_done.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504204910] 

[Estimate the size of a new tree correctly.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504204850] 

[Actually create new .git/HEAD (blush).
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504204825] 

[Use "." as root of GitSlurpies.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504203304] 

[Implement updateHead.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504193546] 

[Implement git_update_head.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504193529] 

[Implement writeGitCommit.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504192232] 

[Add type argument to writeGitFile.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504185421] 

[Make slurpGitCommit return a GitSlurpy after all.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504143935] 

[Implement make_git_file_info.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504142613] 

[Implement purification of Git trees.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504142042] 

[Actually implement purification of blobs.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504125709] 

[Add repo argument to purify.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050503234432] 

[Partial implementation of purifyGitSlurpy.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050503232848] 

[Generalise trackdown.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426233012] 

[Make whatsnew go through Repository.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426162106
 This won't work for Git repositories until they implement slurp_recorded
 and get_recorded.
] 

[Implement git_format_time.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504192053] 

[Export Slurpy constructors.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426195817] 

[Export applyBinary and applyHunkLines.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050503224204] 

[Really don't include directories in slurpies.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050429235609] 

[Make dist work with git repositories.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426203906] 

[Fix merge conflicts.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050425194100] 

[Remove unsafeConstructPS.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050509233129] 

[Declare Git's global variables as extern.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050507224710
 Silly GHCi doesn't grok common symbols.
] 

[Use RepoPrefs.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050506220257] 

[Implement repoPrefs.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050506220152] 

[Export PatchInfo constructor.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050504190531] 

[Implement applyToGitSlurpy.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050503231941] 

[Basic implementation of dirty Git slurpies.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050503222642] 

[Use the cache when slurping the pristine state.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050430000813] 

[Restructure patch generation from Git repos.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050427213320] 

[Don't store directories in slurpies.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050427000833] 

[Instance Show Slurpy.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426235914] 

[Start slurping at ".".
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426203853] 

[Implement slurping from git repositories.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426195957] 

[Make pattern exhaustive.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426195941] 

[Check for presence of .git/HEAD.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426195914] 

[Move slurp_pending and slurp_recorded into Repository.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426185425] 

[Move get_unrecorded to Repository.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426175527] 

[Implement send for git repositories.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050425210728] 

[Implement changes for git repositories.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050425205329] 

[Use ForeignPtrs instead of raw pointers when useful.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050425180449
 Now I remember why I hate Haskell.
] 

[Some less IO monad hacking.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050425180207] 

[Fix handling of subtrees.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050425162405] 

[Implement subtrees.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050425063228] 

[Parse new-style git dates.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050425001902] 

[Initial implementation of pulling from git.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050424213832] 

[Add licence statements to Linus' files.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050426161330] 

[Implement constructPS.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050425180306
 I use touchForeignPtr in the finaliser when building a PS from a
 ForeignPtr.
] 

[Import parts of Linus' git 0.6.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050424213310] 

[Implement unsafeConstructPS.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050424212204] 

[Export diff_files from Diff.lhs.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050424212113] 

[Export emptyFileContents from SlurpDirectory.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050424212051] 

[First cut at remodularising repo access.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050424145002] 

[Change Repository to DarcsRepo.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20050424140132] 

[don't go through shell when execing darcs
Wim Lewis <wiml@hhhh.org>**20050710062743
 Use the LIST variant of exec to avoid exposing the arguments of the darcs
 command to shell interpretation. Also, pipe the output directly to where
 it's going instead of reading it in and writing it out again.
] 

[fix incorrectly quoted regexp
Wim Lewis <wiml@hhhh.org>**20050710051424
 Unquoted regexp evaluated to 0 or 1, which didn't immediately break the cgi
 because most hashes have those characters in them. Also fixed a bogus
 initializer caught by "perl -w".
] 

[update comments in darcs.cgi
Wim Lewis <wiml@hhhh.org>**20050710050226] 

[Use a pipe instead of a temp file
Wim Lewis <wiml@hhhh.org>**20050710005052
 Instead of storing the intermediate XML in a temporary file and then invoking
 xsltproc, just pipe the XML directly into the xslt processor on the fly.
] 

[use darcs_xml() where it simplifies things
Wim Lewis <wiml@hhhh.org>**20050709023659] 

[Merge conflicts in configure.ac, and add blank line to try to avoid future conflicts
Ian Lynagh <igloo@earth.li>**20050707160658] 

[add an unused RepoFormat module.
David Roundy <droundy@abridgegame.org>**20050430123937] 

[TAG 2005-07-07
Ian Lynagh <igloo@earth.li>**20050707144607] 

[Give an author when recording in tests/pull_binary.sh
Ian Lynagh <igloo@earth.li>**20050701181818] 

[atomically overwrite files in DarcsIO when creating a file.
David Roundy <droundy@abridgegame.org>**20050618173853] 

[fix overly specific error message test in pull.pl.
David Roundy <droundy@abridgegame.org>**20050701150742] 

[Need CInt type even when we don't HAVE_CURL
Ian Lynagh <igloo@earth.li>**20050701174843] 

[Fix types in SlurpDirectory
Ian Lynagh <igloo@earth.li>**20050622022044] 

[Fix types in SignalHandler
Ian Lynagh <igloo@earth.li>**20050622021728] 

[Fix types in SelectChanges
Ian Lynagh <igloo@earth.li>**20050622021545] 

[Fix type in Lock.lhs
Ian Lynagh <igloo@earth.li>**20050621205228] 

[Fix types of curses functions
Ian Lynagh <igloo@earth.li>**20050621174621] 

[Fix some types in Exec.lhs
Ian Lynagh <igloo@earth.li>**20050621174238] 

[Fix up types in get_curl
Ian Lynagh <igloo@earth.li>**20050621173131] 

[Remove redundant sift_for_pending
Ian Lynagh <igloo@earth.li>**20050621173121] 

[add test for pulling a binary patch with conflicting working directory removal.
David Roundy <droundy@abridgegame.org>**20050628121211] 

[license aclocal.m4 with a more liberal license.
David Roundy <droundy@abridgegame.org>**20050622123111
 For the curious, I've gotten Benedikt and Will's permission for this
 change, who I believe are the only two other copyright holders on this
 file.
] 

[TAG 1.0.3
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050524215127] 

[bump version to 1.0.3
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050524215115] 

[import James Webb's deps.pl
zooko@zooko.com**20050711203601] 

[zooko's local config: repos in /var/www/pub/repos instead of /var/www/repos
zooko@zooko.com**20050630181050] 

[TAG darcs unstable 2005-05-29
Ian Lynagh <igloo@earth.li>**20050529125403] 

[minor typo fix
jani@iv.ro**20050524093035] 

[TAG 1.0.3rc2
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050515085617] 

[TAG darcs unstable 2005-05-09
Ian Lynagh <igloo@earth.li>**20050509222002] 

[Teach apply how to handle ChangePref patches
Ian Lynagh <igloo@earth.li>**20050615023428] 

[Make more RepoPrefs functions generic in their Monad
Ian Lynagh <igloo@earth.li>**20050615023359] 

[Make some repo prefs functions generic in the Monad they use
Ian Lynagh <igloo@earth.li>**20050615022455] 

[Add m{Write,Read}BinFile, mDoes{Directory,File}Exist to DarcsIO
Ian Lynagh <igloo@earth.li>**20050615022310] 

[Fall back to the inefficient, but safe, separate_middle_last_from_first defn.
Ian Lynagh <igloo@earth.li>**20050615010549] 

[Don't define our lex function separately for PackedStrings, and take it out of Stringalike itself
Ian Lynagh <igloo@earth.li>**20050615024343] 

[Remove '\n's from Docs, and remove some unwanted spaces
Ian Lynagh <igloo@earth.li>**20050615003925] 

[format error to be easier to read
Mark Stosberg <mark@summersault.com>**20050604231330

 Before this change, the description ran directly into the patch name, like
 this:

    Couldn't read patch Wed Jul ...

] 

[provide a clue with there is an error applying patch to recorded.
Mark Stosberg <mark@summersault.com>**20050604230334] 

[quit recommend 'get --verbose'
Mark Stosberg <mark@summersault.com>**20050605004133

 Get now gives nice feedback by default, a continually updating with feedback
 like:
   Copying patch 13 of 135

 --verbose additionally shows the patch IDS, which most people won't care about. 

 So the --verbose recommedation is no longer needed. 
] 

[Tidy up after tests
Ian Lynagh <igloo@earth.li>**20050604193114] 

[Fix test warnings
Ian Lynagh <igloo@earth.li>**20050604193054] 

[RT#413: add TODO test for bug: add should return an error when files can't be read.
Mark Stosberg <mark@summersault.com>**20050602161701] 

[RT#414: test case for 'record' failing when there are multiple files with permissions problems.
Mark Stosberg <mark@summersault.com>**20050602163139] 

[GNUmakefile: update predist to copy Context.hs instead of c_context.c
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050525093936] 

[move some of predist commands to GNUmakefile, to the predist target
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050525090659] 

[add sal_last
Tommy Pettersson <ptp@lysator.liu.se>**20050518194617] 

[Merge changes
Ian Lynagh <igloo@earth.li>**20050515164404] 

[bump version number to 1.0.3rc2
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050515085537] 

[update web page to reflect new stable release (1.0.3)
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050524225643] 

[simple (inefficient) fix to bug in separate_last_from_first_middle.
David Roundy <droundy@abridgegame.org>**20050522133247] 

[extend revert_interactive test to do a trickier revert.
David Roundy <droundy@abridgegame.org>**20050522134059] 

[add test for interactive selection of revert.
David Roundy <droundy@abridgegame.org>**20050522130150
 This test is currently failed by darcs-unstable, but passed by darcs-stable
 and older.  Something is wrong with with_selected_last_changes_to_files in
 darcs-unstable.  :(
] 

[favicon support for rss feeds
Manuel M T Chakravarty <chak@cse.unsw.edu.au>**20050520055950
 - RSS feed readers, such as liferea, search for feed icons (named 'favicon.ico') in the
   directory in which the feed is located
 - By default, we source the icon data from /cgi-bin/favicon.ico, but the location
   can be configured (in the same way as the location of the style sheet file)
 - NB: This is the only way to associated a favicon with a feed on departmental
   web servers etc, where the domain root is not under the feed providers
   control.  (Yet another alternative would be an associated html feed that embeds
   a <link> tag.)
] 

[fix small typo
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050521231058] 

[fix bug when recording with a removed file as an argument (RT #396).
David Roundy <droundy@abridgegame.org>**20050520112358] 

[add changelog entry for fix of bug #396.
David Roundy <droundy@abridgegame.org>**20050519111750] 

[restructure best_practices, remove Basics and raise subsections one level
Tommy Pettersson <ptp@lysator.liu.se>**20050511162756] 

[Remove dead code
Ian Lynagh <igloo@earth.li>**20050515174816] 

[Make --test not keep the patch in memory when recording
Ian Lynagh <igloo@earth.li>**20050515005751] 

[Remove dead code
Ian Lynagh <igloo@earth.li>**20050514161023] 

[remove dirty flag and IO method from Slurpy.
David Roundy <droundy@abridgegame.org>**20050515103942
 These are no longer needed, since we have removed slurp_write and friends.
] 

[change predist pref to simply copy some files from the source repository
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050515085500] 

[GNUmakefile: remove ChangeLog in realclean
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050514172725] 

[explain in replace help that replace is a special patch [RT#317]
Tommy Pettersson <ptp@lysator.liu.se>**20050512113444] 

[Remove dead code related to and including slurp_write
Ian Lynagh <igloo@earth.li>**20050513191928] 

[Remove slurpy writing from Resolution
Ian Lynagh <igloo@earth.li>**20050513191455] 

[Remove slurpy writing from Diff
Ian Lynagh <igloo@earth.li>**20050513184702] 

[Implement clonePaths
Ian Lynagh <igloo@earth.li>**20050513183651] 

[When reverting, make sure the patch is forced before we try to use skipped
Ian Lynagh <igloo@earth.li>**20050514135444] 

[add test for interactive revert [RT#387]
Tommy Pettersson <ptp@lysator.liu.se>**20050513075618] 

[remove unneeded workaround tip for nvi from manual
Tommy Pettersson <ptp@lysator.liu.se>**20050512190248
 The problem was fixed in the patch:
 Tue Apr 26 02:47:50 CEST 2005  Benedikt Schmidt <beschmi@cloaked.de>
   * fix problem when editing long comments with nvi
] 

[Cope with older GHCs that don't have createDirectoryIfMissing
Ian Lynagh <igloo@earth.li>**20050513232827] 

[Remove slurpy writing from Match
Ian Lynagh <igloo@earth.li>**20050513001914] 

[Functions to copy partial pristines and directory trees
Ian Lynagh <igloo@earth.li>**20050512234741] 

[Provide createPristineFromWorking rather than writePristine
Ian Lynagh <igloo@earth.li>**20050512211422] 

[Remove now-unused mmap_slurp_all_but_darcs
Ian Lynagh <igloo@earth.li>**20050512200516] 

[Remove more slurpy stuff from Get
Ian Lynagh <igloo@earth.li>**20050512200453] 

[Implement cloneTreeExcept
Ian Lynagh <igloo@earth.li>**20050512195156] 

[Remove some slurpy writing from Get
Ian Lynagh <igloo@earth.li>**20050512194727] 

[Use withRecorded in Dist
Ian Lynagh <igloo@earth.li>**20050512015113] 

[Rejig createPristineDirectoryTree for easier reuse
Ian Lynagh <igloo@earth.li>**20050511182848] 

[cloneTree now wants an existing directory as dest, rather than non-existing
Ian Lynagh <igloo@earth.li>**20050511182055] 

[Use withRecorded in TrackDown
Ian Lynagh <igloo@earth.li>**20050511175827] 

[Use withRecorded in Repository
Ian Lynagh <igloo@earth.li>**20050511175814] 

[Don't read tempdir_loc if we don't need it
Ian Lynagh <igloo@earth.li>**20050510211725] 

[Remove the = in a flag to make old ghc's happy
Ian Lynagh <igloo@earth.li>**20050513141859] 

[Remove a FIXME comment that has been fixed
Ian Lynagh <igloo@earth.li>**20050513011105] 

[some new ChangeLog entries
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050512210508] 

[make_changelog.hs: use renderStyle instead of show, etc
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050512210424] 

[make_changelog.hs: use fsep to word-wrap ChangeLog entries
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050512201026] 

[resolve conflict with unstable unit testing stuff.
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050512095945] 

[make_changelog.hs: make stylistic changes suggested by Ian Lynagh
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050512093732] 

[make_changelog.hs: use match_parser in entry for better error messages
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050512093718] 

[make_changelog.hs: use formatCalendarTime to show tag dates
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050512085640] 

[export match_parser from PatchMatch
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050512083548] 

[automatically generate ChangeLog if we're in a darcs repository.
David Roundy <droundy@abridgegame.org>**20050511112615] 

[bugfix - make ChangeLog creation really atomic
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050511213435] 

[make_changelog: don't warn about unmatched entries when there are none
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050511205602] 

[fix failure to compile make_changelog with ghc 6.4
David Roundy <droundy@abridgegame.org>**20050511112227
 (multiple imports of liftM etc).
] 

[make ChangeLog generation atomic
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050511204254] 

[Created file for ChangeLog entries added by myself
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050511144029] 

[convert ChangeLog entries since 1.0.2 to a ChangeLog entry database format
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050511104044] 

[auto-generate ChangeLog
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050511104006
 ChangeLog is generated from a database of ChangeLog entries and current
 repo history. Each ChangeLog entry consists of a description and a set
 of PatchMatch matchers. The entry goes into the ChangeLog as soon as all
 the matchers are satisfied.
] 

[add make_changelog, a tool to auto-generate ChangeLog
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050511100512] 

[write about dependencies, branches, conflicts and merging in best_practices
Tommy Pettersson <ptp@lysator.liu.se>**20050511151349] 

[Implement withRecorded
Ian Lynagh <igloo@earth.li>**20050511174853] 

[Use withRecorded in Test
Ian Lynagh <igloo@earth.li>**20050511013028] 

[Be more sensible with exceptions from getSymbolicLinkStatus
Ian Lynagh <igloo@earth.li>**20050511002356] 

[Replace test_slurpy with test_patch
Ian Lynagh <igloo@earth.li>**20050510225229] 

[Remove slurp_write_dirty and slurp_write_and_read_dirty
Ian Lynagh <igloo@earth.li>**20050509221350] 

[Eliminate slurp_write_and_read_dirty from Match
Ian Lynagh <igloo@earth.li>**20050509220731] 

[Eliminate slurp_write_dirty from Apply
Ian Lynagh <igloo@earth.li>**20050509215506] 

[Eliminate slurp_write_dirty from Resolve
Ian Lynagh <igloo@earth.li>**20050509215033] 

[Eliminate slurp_write_dirty from Pull
Ian Lynagh <igloo@earth.li>**20050509214359] 

[Remove write_dirty_Pristine
Ian Lynagh <igloo@earth.li>**20050509211958] 

[Eliminate write_dirty_Pristine from Unrecord
Ian Lynagh <igloo@earth.li>**20050509211418] 

[Eliminate write_dirty_Pristine from Rollback
Ian Lynagh <igloo@earth.li>**20050509210924] 

[Eliminate write_dirty_Pristine from Pull
Ian Lynagh <igloo@earth.li>**20050509210454] 

[Eliminate slurp_write_dirty from Revert
Ian Lynagh <igloo@earth.li>**20050509205619] 

[Eliminate slurp_write_dirty from Unrevert
Ian Lynagh <igloo@earth.li>**20050509205051] 

[Eliminate slurp_write_dirty from Unrecord
Ian Lynagh <igloo@earth.li>**20050509203955] 

[Eliminate slurp_write_dirty from Replace
Ian Lynagh <igloo@earth.li>**20050509195038] 

[Eliminate write_dirty_Pristine from AmendRecord
Ian Lynagh <igloo@earth.li>**20050508160258] 

[Eliminate slurp_write_dirty from Trackdown
Ian Lynagh <igloo@earth.li>**20050508151427] 

[Eliminate write_dirty_Pristine from Apply
Ian Lynagh <igloo@earth.li>**20050508150729] 

[Eliminate slurp_write_dirty from Get
Ian Lynagh <igloo@earth.li>**20050508145207] 

[Remove doubled space
Ian Lynagh <igloo@earth.li>**20050508125407] 

[Override LC_ALL rather than LANG
Ian Lynagh <igloo@earth.li>**20050506010451] 

[use modules in configure test programms, fixes compilation with GHC-6.5
Benedikt Schmidt <beschmi@cloaked.de>**20050504133354] 

[fix test printer.pl for ascii art escape quoting highlighting
Tommy Pettersson <ptp@lysator.liu.se>**20050503164241] 

[Updated my (Marnix Klooster's) canonical e-mail address.
Marnix Klooster <marnix.klooster@gmail.com>**20050502132900] 

[Unify presentation of path names
schnetter@aei.mpg.de**20050430163852
 Introduce a function formatPath in DarcsUtils that formats a path name
 nicely for presenting it to the user.  It puts quotes around the
 string, so that the user knows where the path name begins and ends,
 and escapces backslashes and quote characters.
] 

[attempted workaround for old Perl versions that don't understand UTF very well.
Mark Stosberg <mark@summersault.com>**20050430163606] 

[refactor
Mark Stosberg <mark@summersault.com>**20050430163230] 

[fix bug in three-way merge and commute of mergers.
David Roundy <droundy@abridgegame.org>**20050507133829
 Alas, this does *not* appear to fix the problem with darcs-stable and
 darcs-unstable and merger patch reorderings which has shown up recently.
] 

[Improve questions asked while reverting
Erik Schnetter <schnetter@aei.mpg.de>**20050507081237] 

[Tweak selection code so 'a' has performance closer to --all
Ian Lynagh <igloo@earth.li>**20050506210026] 

[If we get to the end of the patches, we may as well calculate their length
Ian Lynagh <igloo@earth.li>**20050506020408] 

[Calculate number of patches with 'c'
Ian Lynagh <igloo@earth.li>**20050506015948] 

[Pass in number of patches (when easy) to select changes
Ian Lynagh <igloo@earth.li>**20050506014747] 

[Avoid extra patch selection pass in the simple (no restriction) case
Ian Lynagh <igloo@earth.li>**20050506010752] 

[Merge changes
Ian Lynagh <igloo@earth.li>**20050506004840] 

[Apply patch choice selection optimisation to other cases
Ian Lynagh <igloo@earth.li>**20050423023203] 

[Unsafe pull_firsts_middles optimisation
Ian Lynagh <igloo@earth.li>**20050412233738] 

[add support for displaying patches with pager
Benedikt Schmidt <beschmi@cloaked.de>**20050429132148] 

[make escape quotings in non-color mode stand out with ascii art
Tommy Pettersson <ptp@lysator.liu.se>**20050503125900] 

[bugfix, --tags didn't work in unpull and unrecord [RT#370]
Tommy Pettersson <ptp@lysator.liu.se>**20050503064130
 Patches are inverted during the unpull/unrecord selection, so the matcher
 would see 'UNDO:' as prefix to all names (except real undo patches that
 would have the 'UNDO:' removed).  Tags are identified by the prefix
 TAG, but their inverted form have the prefix 'UNDO: TAG' which is not
 recognized as a tag by the tag matcher.

 The fix is to (re)invert patches before the matcher is applied to them.
] 

[fix impossible case that was possible after all in PatchApply.
David Roundy <droundy@abridgegame.org>**20050502114355
 I was able to trigger this case in a darcs revert.  I don't think this
 modification will slow it down.
] 

[handle empty path for ssh urls RT#205
Benedikt Schmidt <beschmi@cloaked.de>**20050430225359
 and remove duplicate / because the filename is always added
 to the directory with ++"/_darcs/filename"
] 

[work around backslash problem in test scripts for better portability
Tommy Pettersson <ptp@lysator.liu.se>**20050428104835] 

[improve error message when unpull can't commute past pending
Tommy Pettersson <ptp@lysator.liu.se>**20050429210726
 The idea is to hint the user both to what the problem is and how to
 fix it.
] 

[improve error message when sftp fails RT#205
Benedikt Schmidt <beschmi@cloaked.de>**20050428235843
 explain that sftp doesn't expand ~ and don't show complete
 list of files
] 

[Make error message for moving a file to a non-added dir more clear
Thomas Zander <zander@kde.org>**20050428214347] 

[Fix offset bug in win32/System/Posix.hs
Josef Svenningsson <josef.svenningsson@gmail.com>**20050423164053] 

[allow my-home-relative ssh paths
zooko@zooko.com**20050429185858] 

[fix the test for unset variable
zooko@zooko.com**20050429185756] 

[remove my local path
zooko@zooko.com**20050429185749] 

[make sure darcs binary dir is on path, move EDITME variables to the top
zooko@zooko.com**20050429170755] 

[prefix putty binary dir to path
zooko@zooko.com**20050429164900] 

[fix cygwin-wrapper.bash to not convert ssh "remote location" arguments
zooko@zooko.com**20050429164007] 

[Remove AntiMemo
Ian Lynagh <igloo@earth.li>**20050427130333] 

[add -a option to unrevert
jani@iv.ro**20050425131337] 

[Fix typo
Ian Lynagh <igloo@earth.li>**20050428000517] 

[Merged exact match from stable and resolved conflicts
John Goerzen <jgoerzen@complete.org>**20050425183607] 

[Added new match type "exact"
John Goerzen <jgoerzen@complete.org>**20050425154735] 

[Updated documentation for matches to include new exact type
John Goerzen <jgoerzen@complete.org>**20050425154650] 

[Added documentation for existing author match
John Goerzen <jgoerzen@complete.org>**20050425154636] 

[updated wiki url format in error message
shae@ScannedInAvian.com**20050426233817] 

[Merge changes
Ian Lynagh <igloo@earth.li>**20050426231601] 

[Merge changes
Ian Lynagh <igloo@earth.li>**20050426230057] 

[typo fix
shae@ScannedInAvian.com**20050425192351] 

[change scannedinavian.org to darcs.net for the wiki move
shae@ScannedInAvian.com**20050425194044] 

[Switch version state back to unstable
Ian Lynagh <igloo@earth.li>**20050426225417] 

[TAG 1.0.3rc1
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050426002554] 

[bump version number to 1.0.3rc1 and update ChangeLog
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050426002535] 

[adjust version suffix for the stable repository
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050420121711] 

[canonize some contributors
Benedikt Schmidt <beschmi@cloaked.de>**20050426015933] 

[fix problem when editing long comments with nvi
Benedikt Schmidt <beschmi@cloaked.de>**20050426004750
 set stdin to blocking mode before calling the editor
 stdin needs to be evaluated before doing that
] 

[Describe "stats" option for list_authors
schnetter@aei.mpg.de**20050425231711] 

[optimize ColourPrinter, use constant Both-printables
Tommy Pettersson <ptp@lysator.liu.se>**20050426121219] 

[add functionality for DARCS_DONT_ESCAPE_TRAILING_CR in ColourPrinter
Tommy Pettersson <ptp@lysator.liu.se>**20050426121148] 

[document DARCS_DONT_ESCAPE_TRAILING_CR
Tommy Pettersson <ptp@lysator.liu.se>**20050411154138] 

[optimize ColourPrinter escape quoting
Tommy Pettersson <ptp@lysator.liu.se>**20050426115218] 

[optimize userchunkPrinter in ColourPrinter on fast packed strings
Tommy Pettersson <ptp@lysator.liu.se>**20050426114605] 

[add spanEndPS (and findFromEndUntilPS) to FastPackedString
Tommy Pettersson <ptp@lysator.liu.se>**20050410142338] 

[bugfix, don't skip rest of char escape tests in space-escape mode
Tommy Pettersson <ptp@lysator.liu.se>**20050409124637
 This worked because only spaces are escaped with poSpace set, but if
 that changes no non-spaces would have been esacped when poSpace is set.
] 

[Only go through file once when applying hunks
Ian Lynagh <igloo@earth.li>**20050424191033] 

[Avoid multiple file reads when applying hunks to a file
Ian Lynagh <igloo@earth.li>**20050418224517] 

[Avoid unnecessary lines/unlines of files when applying patches
Ian Lynagh <igloo@earth.li>**20050418200353] 

[update ChangeLog (colorization and escaping, --sendmail-command)
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050424204421] 

[fix bug where send --dry-run would sometimes prompt for an email address.
David Roundy <droundy@abridgegame.org>**20050423112043
 I also took this opportunity to clean up the code just a tad.  wants_output
 had no business being in the IO monad...
] 

[Correct ln -s call after building docs
Ian Lynagh <igloo@earth.li>**20050422205904] 

[Merge changes
Ian Lynagh <igloo@earth.li>**20050422205225] 

[preproc.hs: note that the result is automatically generated
Florian Weimer <fw@deneb.enyo.de>**20050408164946

 The note is inserted directly in front of the copyright message, which
 might look like a contradiction, but I don't think this is actually a
 problem.
] 

[Send.lhs: add seperator between email address and message
Florian Weimer <fw@deneb.enyo.de>**20050408160624

 Without the separator, the message is hard to read because it's not
 completely obvious where the email address begins.  (This is also
 helpful if darcs is ever localized.)
] 

[Send.lhs: clarify the pre-send message which contains the email address
Florian Weimer <fw@deneb.enyo.de>**20050408155141] 

[configure.ac: $HTLATEX does not really support -d, so use cd instead.
Florian Weimer <fw@deneb.enyo.de>**20050408153450

 In some versions of tex4ht, htlatex does not pass the -d argument to all
 the tex4ht programs it invokes.  This means that the files are created
 in the current directory, which has the unfortunate consequence of
 overwriting darcs.css.
] 

[fix bug introduced in send where it always wanted a --to address.
David Roundy <droundy@abridgegame.org>**20050422122526] 

[in send --dry-run, state to whom we're sending.
David Roundy <droundy@abridgegame.org>**20050421110244] 

[add documentation for author match type in manual
Tommy Pettersson <ptp@lysator.liu.se>**20050418144257] 

[Avoid stack overflow on large binary patches.
peter@zarquon.se**20050417085200] 

[Fix a readPatchPS that slipped through
Ian Lynagh <igloo@earth.li>**20050421021415] 

[make test by default *compile* unit, and fix compile of unit.
David Roundy <droundy@abridgegame.org>**20050418123745] 

[Make sure we get to the end of files when reading them lazily
Ian Lynagh <igloo@earth.li>**20050417203702] 

[Add an import list
Ian Lynagh <igloo@earth.li>**20050417160435] 

[Improve laziness of get
Ian Lynagh <igloo@earth.li>**20050417160237] 

[Fix [PackedString]'s readInt
Ian Lynagh <igloo@earth.li>**20050417160006
 This is really covering up a bug in readIntPS where it'll run off the
 end of the PackedString if it's all digits. This can't happen in
 well-formed patches in a single PackedString, but should be fixed
 nevertheless.
] 

[readPatchFileLazily is really gzReadPatchFileLazily
Ian Lynagh <igloo@earth.li>**20050417153051] 

[Small tidy-up
Ian Lynagh <igloo@earth.li>**20050417130858] 

[Stringalike [PackedString]
Ian Lynagh <igloo@earth.li>**20050417023321] 

[Tidy up readPatchFileLazily
Ian Lynagh <igloo@earth.li>**20050416190856] 

[Remove inappropriate PS suffices
Ian Lynagh <igloo@earth.li>**20050416184739] 

[Don't put SCCs in Record or SelectChanges
Ian Lynagh <igloo@earth.li>**20050416160628] 

[Read the patch back as a string when recording to get laziness
Ian Lynagh <igloo@earth.li>**20050413034632] 

[Generalise patch reading. (functions will want renaming if this sticks)
Ian Lynagh <igloo@earth.li>**20050413034600] 

[Stringalike class
Ian Lynagh <igloo@earth.li>**20050413034412] 

[Implement gzReadFile
Ian Lynagh <igloo@earth.li>**20050413034302] 

[Replace my_memrchr() with strrchr().
Ralph Corderoy <ralph@inputplus.co.uk>**20050417220534
 Given it's only ever called on a string, not an arbitrary lump of
 memory, my_memrchr() can be replaced with strrchr() which is in
 <string.h>.
] 

[use "C" rather than "c" for locale name (in tests/printer.pl)
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050417160250] 

[fix tests/printer.pl - in utf8 locales Perl was writing files in utf8
Tomasz Zielonka <tomasz.zielonka@gmail.com>**20050417160217] 

[Correct argument help for "darcs trackdown"
Erik Schnetter <schnetter@aei.mpg.de>**20050417145334] 

[TAG darcs unstable 2005-04-19
Ian Lynagh <igloo@earth.li>**20050419184928]
msg2599 (view) Author: markstos Date: 2008-01-19.15:48:44
I'm marking this bug report as "need example", although I suspect it might be
resolved by now, having not had a "me too" case since early 2006.
msg2602 (view) Author: droundy Date: 2008-01-19.16:25:11
I've just written (and am now pushing) a patch that eliminates all calls to
impossible in Darcs.Patch.Choices (formerly PatchChoices.lhs).  While I don't
believe this bug was still present, this change means that it can no longer happen.
History
Date User Action Args
2006-03-23 16:52:52zookocreate
2006-04-03 12:05:30droundysetnosy: droundy, tommy, zooko
2007-07-23 13:48:59koweysetnosy: + kowey, beschmi
title: Impossible case at PatchChoices.lhs:187 compiled 15:10:23 Mar 9 2006 -> pull (select) => Impossible case at PatchChoices.lhs:187 (1.0.6pre1)
2008-01-19 15:48:45markstossetstatus: unread -> waiting-for
nosy: + markstos
messages: + msg2599
2008-01-19 16:25:12droundysetstatus: waiting-for -> resolved-in-unstable
nosy: droundy, tommy, beschmi, kowey, markstos, zooko
messages: + msg2602
2008-05-02 09:11:04koweysetstatus: resolved-in-unstable -> resolved
nosy: + dagit
2009-08-06 17:37:53adminsetnosy: + jast, Serware, dmitry.kurochkin, darcs-devel, mornfall, simon, thorkilnaur, - droundy
2009-08-06 20:34:36adminsetnosy: - beschmi
2009-08-10 21:44:40adminsetnosy: - darcs-devel, jast, Serware, mornfall
2009-08-10 23:53:42adminsetnosy: - dagit
2009-08-25 17:51:30adminsetnosy: + darcs-devel, - simon
2009-08-27 13:58:11adminsetnosy: tommy, kowey, markstos, darcs-devel, zooko, thorkilnaur, dmitry.kurochkin