[prev in list] [next in list] [prev in thread] [next in thread]
List: darcs-devel
Subject: [darcs-devel] [issue1817] merge regression
From: Dave Love <bugs () darcs ! net>
Date: 2010-04-18 11:10:22
Message-ID: 87pr1xqaor.fsf () fx-laptop ! ukfsn ! org
[Download RAW message or body]
New submission from Dave Love <fx@gnu.org>:
With the current 2.4-ish source, when I get put into the external merge
tool I seem invariably to get an empty `variant A' and a single marked
conflict covering the whole of variant B. With Ubuntu's 2.3.0 I get a
sensible result with a non-empty A and the expected small regions in
which to resolve conflicts. I'm surprised it doesn't seem to have been
reported already, or have I failed to find it in the bug tracker. I'm
not sure how easily I can construct a simple test case, but I'll have a
go if you need it.
----------
files: unnamed
messages: 10749
nosy: darcs-devel, dmitry.kurochkin, fx
status: unknown
title: merge regression
__________________________________
Darcs bug tracker <bugs@darcs.net>
<http://bugs.darcs.net/issue1817>
__________________________________
["unnamed" (text/plain)]
darcs compiled on Apr 17 2010, at 20:18:58
Context:
[Create manual directory if it doesn't exist
Matthias Kilian <kili@outback.escape.de>**20100413155518
Ignore-this: d04fb2f93c3ca2f2063de65d37cb845c
]
[Camel case IsoDate.
Eric Kow <kowey@darcs.net>**20100413090324
Ignore-this: 28711c4f06efbca91d32e58cccbd4aef
]
[Camel case Printer and Darcs.ColorPrinter.
Eric Kow <kowey@darcs.net>**20100413090019
Ignore-this: ac34462e93c124a525a701613888ebcf
]
[Camel case Exec, Darcs.Utils and Darcs.External.
Eric Kow <kowey@darcs.net>**20100413084749
Ignore-this: af802a1f850a6b4a9b11748ae98373fa
]
[Also update release date on homepage
Reinier Lamers <tux_rocker@reinier.de>**20100412203602
Ignore-this: aebc0ebf001f605c6c5976b513181c42
]
[Update website for 2.4.1 release
Reinier Lamers <tux_rocker@reinier.de>**20100412203338
Ignore-this: 2836e036539c6e909b1a6a730bb4da4f
]
[Implemented all test cases from the discussion of bug 1645
Dmitry Astapov <dastapov@gmail.com>**20100406055346
Ignore-this: 315cde3de56fabf831ba0eccd9b05dcd
]
[Fix darcs bug tip (missing space).
Eric Kow <kowey@darcs.net>**20100408095322
Ignore-this: b4efd917ad2640b42d66dc8289dc9935
]
[Disable DARCS_PATCHES_XML posthook test on Windows.
Eric Kow <kowey@darcs.net>**20100406090852
Ignore-this: 94599a3c536d6918b676a37c1c515c09
]
[Make issue1739 test skip instead of fail on non-UTF-8 locales
Reinier Lamers <tux_rocker@reinier.de>**20100405182339
Ignore-this: 5dac9d7dc54f00ce0ea7ebd05fbadc8
]
[Accept issue1363: mark-conflicts inconsistency with duplicate patches.
Eric Kow <kowey@darcs.net>**20100405162547
Ignore-this: c0e670a8b86320a2f49d44e40700ee05
]
[Accept issue1737: confusing darcs move error message.
Eric Kow <kowey@darcs.net>**20100404232819
Ignore-this: 6b4724073f797920079fb8f18186c4e1
]
[drop unnecessary GHC extensions from test helper
Ganesh Sittampalam <ganesh@earth.li>**20100330060645
Ignore-this: 8f680413627f62d2a64367b09566d4e9
]
[speed up test by compiling helper once
Ganesh Sittampalam <ganesh@earth.li>**20100330060335
Ignore-this: 9a99e3313b15ae22fd66c7d41990e783
]
[add type witnesses to trackdown --bisect
Ganesh Sittampalam <ganesh@earth.li>**20100330055445
Ignore-this: 6a7461b8379b0fa2435b8c520d2bd0f0
]
[fix warning
Ganesh Sittampalam <ganesh@earth.li>**20100330055412
Ignore-this: c63adb3883ec2755ee42c4865227c823
]
[resolve-issue1208: trackdown --bisect (PatchTree).
dixiecko@gmail.com**20100329221033
Ignore-this: 2cf3fae3067034ba33b03e597c31be3f
]
[Test for issue183.
Eric Kow <kowey@darcs.net>**20100402201819
Ignore-this: 749fd958582f0066da64ffef2ba654af
This fails with Darcs 2.2 but passes with my "Resolve issue183" patch.
]
[Fix bug in issue1645 test.
Eric Kow <kowey@darcs.net>**20100401131100
Ignore-this: dfcf454712d2a5bbcdd68c663f4c5218
]
[Avoid a direct multibyte string in issue1739 test that confuses ShellHarness.
Petr Rockai <me@mornfall.net>**20100330234535
Ignore-this: bce2d83738d201cd25dcc644a9f45fe2
]
[Refactor makeRemovePatch: use foldM and split in two
Reinier Lamers <tux_rocker@reinier.de>**20100321101733
Ignore-this: 2be7c48e7b74377519f3d6dcb33bdeeb
]
[Rename issue1765 test to reflect that it succeeds
Reinier Lamers <tux_rocker@reinier.de>**20100320172808
Ignore-this: 1f72ba012bb3cb79a6e05e75f5befdc6
]
[resolve issue1765: refuse to remove non-tracked directories recursively
Reinier Lamers <tux_rocker@reinier.de>**20100320165913
Ignore-this: ee68c106b9320035e66563387c82d1de
The modifyTree function from hashed-storage makes any directories on the path
to modify exist. When removing a non-tracked file, this made darcs assume that
its parent directory was tracked, even when it wasn't.
This patch makes darcs do the modifyTree only when the remove of a file
actually succeeded, so that when a remove of a non-tracked file fails, darcs
won't have a data structure that reflects a world where this removal succeeded.
]
[Tidy up issue1727 test.
Eric Kow <kowey@darcs.net>**20100329152507
Ignore-this: cd01b4e40793c07bcd8fc4b0ba3fc570
]
[Accept issue1727: darcs move . target fails.
Sean Erle Johnson <merehap@gmail.com>**20100329152220
Ignore-this: a03afb31163d1cd9e4bf39775c2231a9
]
[resolve issue1427 accept gzipped patch bundles in darcs apply
Guillaume Hoffmann <guillaumh@gmail.com>**20100321105908
Ignore-this: eb582991fcd855ba6836919559c4e305
]
[accept issue1427 accept gzipped patch bundles in darcs apply
Guillaume Hoffmann <guillaumh@gmail.com>**20100321105638
Ignore-this: 4607b02530f8de85e9e9165f993b1080
]
[Extend issue1645 with additional pathologies.
Trent W. Buck <trentbuck@gmail.com>**20100327061617
Ignore-this: f0ade119d4126af22b88cc21f23215ec
]
[Resolve issue1756: new h-s handles file removals correctly in Index.
Petr Rockai <me@mornfall.net>**20100324212453
Ignore-this: bbedaa58cc6630492efed346332ee21d
]
[disable unused do binding warnings for now
Ganesh Sittampalam <ganesh@earth.li>**20100317190703
Ignore-this: f95d7ccbde494a04eeed2391800e14b7
The alternative to this would be to go through the code and actually fix
the warnings, and it's not obvious this is desirable.
]
[add PatternGuards extension to witnesses build
Ganesh Sittampalam <ganesh@earth.li>**20100317190650
Ignore-this: 4ec25389175f525264b359d08a01939b
]
[add cabal flag to control build of darcs library
Ganesh Sittampalam <ganesh@earth.li>**20100317190648
Ignore-this: d2ab724f18b7b52ec3f90b3638856cf7
]
[Make commuteFL symmetrical with commuteRL
Florent Becker <florent.becker@ens-lyon.org>**20100321150747
Ignore-this: 89401ec18692de220c8c0717ab390923
]
[useless string concatenation plus useless $.
refis.thomas@gmail.com**20100320231905
Ignore-this: 5ae00cbb8df010b049448b9680fc759f
]
[use isPrefixOf instead of take x y == "string" in some places
Guillaume Hoffmann <guillaumh@gmail.com>**20100321144255
Ignore-this: c5c2dc8a3862c46b6f6c2d206eedff8f
]
[accept issue1763: pull on non-ascii filenames
Reinier Lamers <tux_rocker@reinier.de>**20100321144249
Ignore-this: b09a1beef9dbb6a6bd46d5b03cb04712
]
[resolve issue1739: make ColorPrinter handle characters > 255
Reinier Lamers <tux_rocker@reinier.de>**20100221155614
Ignore-this: ff06ddd7ef801f92cbf66cfd9ba4e467
]
[remove the hardcoded string "_darcs" in some places and replace it with the global \
darcsdir David Markvica <david@blueshellturtle.com>**20100110201836
Ignore-this: 37f9eb21f1e6af46283a1ee985843b2f
]
[export stdout in RepoPath
Florent Becker <florent.becker@ens-lyon.org>**20100215153909
Ignore-this: 7e5aaea98f7931aae8176d6ede188961
]
[demonadify useAbsoluteOrStd
Florent Becker <florent.becker@ens-lyon.org>**20100215152808
Ignore-this: 3bf358bcbefa08b3e9121fad91014b8
]
[Put presentParticiple into the English module
Florent Becker <florent.becker@ens-lyon.org>**20100204140434
Ignore-this: 5edb03b4ae71697774715244342315fc
]
[add --keep-date option to amend-record
Ganesh Sittampalam <ganesh@earth.li>**20100320233508
Ignore-this: 98c0e9dea29abe79f63bf15d82d3dc38
]
[Resolve conflict between tar dependency and hashed-storage bump
Reinier Lamers <tux_rocker@reinier.de>**20100321123909
Ignore-this: 58bf27fb7550445f7ad3c74456786f96
]
[Bump hashed-storage dependency to 0.4.8
Salvatore Insalaco <kirby81@gmail.com>**20100321103955
Ignore-this: 3e54bef5ade88f3c402c8e9eecbd7ca
]
[Accept issue1765: recursive remove on root
Luca Molteni <volothamp@gmail.com>**20100320143438
Ignore-this: 90de508f42c0d4b5b4379fefb6a92995
]
[Resolve issue643 darcs send -o outputs remote repo email address
Guillaume Hoffmann <guillaumh@gmail.com>**20100320162730
Ignore-this: ba9b2380b2e327f45a2ae038fad2d3e3
]
[useless string concatenation
Guillaume Hoffmann <guillaumh@gmail.com>**20100320135054
Ignore-this: 78e61463ba38c7fbc023b6eccbb33571
]
[Add --match option to apply
Florent Becker <florent.becker@ens-lyon.org>**20100320150651
Ignore-this: f4fb470e62d58da25c74a42a9f7e96e0
]
[use library function 'not' for checking failure
Ganesh Sittampalam <ganesh@earth.li>**20100320150215
Ignore-this: be9fc5ba5f1811d94f3a0694c1037453
]
[Resolve issue1473: annotate command accepts "." and treats "" as invalid input
mail@stefanwehr.de**20100320141718
Ignore-this: 5faea0580f9cf17ee59964a509f90613
]
[Only use stderr in install-deps, avoiding stderr/stdout interleaving issues.
Petr Rockai <me@mornfall.net>**20100320143212
Ignore-this: 7fe9820f10015867f17d70f39ef5e201
]
[Pass the install-deps options down to second cabal install call as well.
Petr Rockai <me@mornfall.net>**20100320134009
Ignore-this: 5061ea1965ed6856ee0cf455c27e2ae0
]
[We also need tar to build witnesses.
Petr Rockai <me@mornfall.net>**20100320133306
Ignore-this: cb1dc2f700b84d5564927fb95245c39f
]
[make dist.sh test check the archive created by dist
Guillaume Hoffmann <guillaumh@gmail.com>**20100320095521
Ignore-this: 5261970d6966520b0d2bb70acc98982d
]
[resolve issue1456 by using Tar and GZip haskell modules for dist
Guillaume Hoffmann <guillaumh@gmail.com>**20100319163315
Ignore-this: 88ac3e7b6b545dc284a829ca1c2f6082
]
[Removed -cpp flag as suggested by HLint
Stefan Wehr <mail@stefanwehr.de>**20100319142241
Ignore-this: 2ffd2a7a3f52bc2117b0033079177173
]
[New bugtracker reporting page.
Eric Kow <kowey@darcs.net>**20100318215106
Ignore-this: 436df165c5621e18029dcaf5838faa59
]
[replace if-statement with guard in elegant_merge
Jason Dagit <dagit@codersbase.com>**20100318030051
Ignore-this: 8e359f579041af4f5ea2a6deca40341c
]
[Resolve issue1750: uncover help text for darcs show pristine.
Eric Kow <kowey@darcs.net>**20100221125933
Ignore-this: 46c8575ff5889d6092f9e5a221275732
f r { foo = bar } means f (r { foo = bar })
whereas what we really wanted was (f r) { foo = bar }
]
[Correct online help text for aliases of subcommands.
Eric Kow <kowey@darcs.net>**20100221125653
Ignore-this: e33fe432bc0ef53205103cabdcd33a61
]
[Augment the .boring file to cover the generated manual bits.
Petr Rockai <me@mornfall.net>**20100120201503
Ignore-this: e01e6731b72711d565e47c0c8cd4222d
]
[Update tests/README.test_maintainers.txt to cabalized build system
Reinier Lamers <tux_rocker@reinier.de>**20100315171511
Ignore-this: 3b869e68133c1c79dcbe44aa811ec40
]
[Include tests/README.test_maintainers.txt in distribution tarballs
Reinier Lamers <tux_rocker@reinier.de>**20100314130520
Ignore-this: 5b326ecc806c89dc64b297ab93bbc665
]
[Fix update_roundup.pl for the case where only one patch is applied.
Eric Kow <kowey@darcs.net>**20100315131029
Ignore-this: 94d433b30629456470cd337f1404132a
We need to avoid the XML::Simple feature that uses simple scalar values for
tags that only have one elment in them. For more information, perldoc
XML::Simple::FAQ.
]
[resolve issue1767: send CRC warnings to stderr
Ganesh Sittampalam <ganesh@earth.li>**20100314224948
Ignore-this: b0555759c3fa55fc9689f9a957d9eb1
]
[Fix my posthook test (sorry!).
Eric Kow <kowey@darcs.net>**20100314204956
Ignore-this: 1644ca3a512ac4b020d992ab1a61608c
]
[Test for DARCS_PATCHES_XML.
Eric Kow <kowey@darcs.net>**20100314195355
Ignore-this: b48913e1dc123d75e688ab9d0b949180
]
[Also add PatchInfo test module to darcs.cabal
Reinier Lamers <tux_rocker@reinier.de>**20100313225611
Ignore-this: b5cc937839f36206c5a7c11fde15305c
]
[Test release tarballs more thoroughly in release.sh
Reinier Lamers <tux_rocker@reinier.de>**20100313225454
Ignore-this: 423fe1d4b4a8c97758c937fae9df3c7a
]
[Add missing unit test modules to darcs.cabal
Reinier Lamers <tux_rocker@reinier.de>**20100313221428
Ignore-this: 22eb7e0530a1b81cd8da21c35974a4e1
]
[resolve conflict between witnesses and Origin import
Ganesh Sittampalam <ganesh@earth.li>**20100306185527
Ignore-this: 74eb31398aa3576b430d3e81d9943b3d
]
[resolve conflict between witness addition and issue1749 fix
Ganesh Sittampalam <ganesh@earth.li>**20100306185242
Ignore-this: c33d05a6410a452c005ecac1362d594f
]
[add witnesses to Darcs.Commands.Replace
Ganesh Sittampalam <ganesh@earth.li>**20100210210633
Ignore-this: 96da24a06dde4b3eba357230cf054c7a
]
[fix witnesses in Darcs.Commands.Remove using gaps
Ganesh Sittampalam <ganesh@earth.li>**20100210210003
Ignore-this: 352fa85ba57dd1d1a907a42ced4324f7
]
[add witnesses to Darcs.Commands.Check
Ganesh Sittampalam <ganesh@earth.li>**20100210191307
Ignore-this: 4d197c1f543741abaa78d9dac26573b7
]
[add witnesses to Darcs.Repository.Repair
Ganesh Sittampalam <ganesh@earth.li>**20100210190716
Ignore-this: 23432ed7f437a4d7fc964ec4e6f8db99
]
[add witnesses to treeDiff
Ganesh Sittampalam <ganesh@earth.li>**20100210184308
Ignore-this: 2d73685b18d3132b6d27eb47a9239ca1
]
[everything now compiles with witnesses
Ganesh Sittampalam <ganesh@earth.li>**20100211184608
Ignore-this: 78389082d81bcf4d56b6ca17c83a9344
Note that because of some bits of conditional compilation, this doesn't
mean we can turn witnesses on for the real build yet.
]
[add witnesses to Darcs.Commands.Rollback
Ganesh Sittampalam <ganesh@earth.li>**20100211184435
Ignore-this: 160f72201755ce5b42ac23ade377fccd
]
[add witnesses to Darcs.Commands.Convert
Ganesh Sittampalam <ganesh@earth.li>**20100211181613
Ignore-this: c248f20a43b06b92b45c3c01ddbd93f9
]
[add witnesses to Darcs.Commands.MarkConflicts
Ganesh Sittampalam <ganesh@earth.li>**20100211113510
Ignore-this: 6ab56b2f81bf05be63b1ea68f90604f9
]
[add witnesses to Darcs.Commands.Revert
Ganesh Sittampalam <ganesh@earth.li>**20100211113418
Ignore-this: 8c04a7f6c4f43e21b43235e2cff49901
]
[add witnesses to Darcs.Commands.AmendRecord
Ganesh Sittampalam <ganesh@earth.li>**20100211113324
Ignore-this: 8e4866806ec8fd82ee57e8385fd7bc12
]
[use tentative repo in askAboutDepends
Ganesh Sittampalam <ganesh@earth.li>**20100211113157
Ignore-this: d1937b4194d0a5e32fd543ebb7139457
]
[add witnesses to Darcs.Commands.Optimize
Ganesh Sittampalam <ganesh@earth.li>**20100211111941
Ignore-this: c89c41e7e3a33186df876c8139b065e4
]
[add witnesses to Darcs.Commands.Put
Ganesh Sittampalam <ganesh@earth.li>**20100211111204
Ignore-this: 2fa39ac0cd590d9fd6051a201605b7c6
]
[return new repo from applyToWorking
Ganesh Sittampalam <ganesh@earth.li>**20100211110410
Ignore-this: b5aea13a912440abfe4e645f8a9c80ef
]
[add witnesses to Darcs.Commands.Get
Ganesh Sittampalam <ganesh@earth.li>**20100210205723
Ignore-this: 485a129fd292695b5b8e4f5cf714be70
]
[add witnesses to Darcs.Commands.Add
Ganesh Sittampalam <ganesh@earth.li>**20100210203754
Ignore-this: dcb548d2e96b50c3cccede82e84758da
]
[add witnesses to Darcs.Commands.Record
Ganesh Sittampalam <ganesh@earth.li>**20100210193209
Ignore-this: ef01c3841210514485e13621ca5f5a12
]
[add witnessed toFL operation
Ganesh Sittampalam <ganesh@earth.li>**20100210193104
Ignore-this: f1585c7f0d8e15edb216b9750e591ddb
]
[add witnesses to Darcs.Commands.Move
Ganesh Sittampalam <ganesh@earth.li>**20100210191544
Ignore-this: c55d6910e4d79a2a8bfe47f1cdc150ad
]
[add witnessed variant of PatchInfo
Ganesh Sittampalam <ganesh@earth.li>**20100210185926
Ignore-this: b9f54295d9eca8687a4a785b5d8e9028
]
[reduce conditionalisation on witnesses in Darcs.Patch.Commute
Ganesh Sittampalam <ganesh@earth.li>**20100126201933
Ignore-this: 6ba0e070aff1bbac7a0f4d508aced1cb
]
[add TypeOperators to witnesses build
Ganesh Sittampalam <ganesh@earth.li>**20091221190333
Ignore-this: 22808f3dad964cb930d44436080c93e2
]
[add docs to Gap and related types
Ganesh Sittampalam <ganesh@earth.li>**20100212180627
Ignore-this: 9013feebb49e489e1d1c7c5770d191da
]
[add concept of gaps
Ganesh Sittampalam <ganesh@earth.li>**20091211010754
Ignore-this: afe3115fd2333f00cb5a4c8a1f7ec281
]
[return new repository state from tentativelyAdd etc
Ganesh Sittampalam <ganesh@earth.li>**20091202191833
Ignore-this: 72a9c476023fa0c22cd0aa21d1f6ef1e
]
[adding patches should affect the tentative state
Ganesh Sittampalam <ganesh@earth.li>**20091127174439
Ignore-this: a98e2488424993191bd790f76ee819c0
]
[make tentativelyRemove return the new repo state
Ganesh Sittampalam <ganesh@earth.li>**20091127174338
Ignore-this: 683cba083ab428a231d8b2c2a144980c
]
[Resolve issue1753: restrict mmap to version used by hashed-storage.
Eric Kow <kowey@darcs.net>**20100301163950
Ignore-this: a53ca223c957f80ff5b021fc6c2026d8
Looks like we'll have to be careful about synchronising the dependencies.
]
[Remove intermediary files from "cabal sdist" tarball.
Trent W. Buck <trentbuck@gmail.com>**20100219003943
Ignore-this: ddb9caa7bf9025c8e8b0ea8897e82844
AFAICT these files are generated during "make html pdf", and are thus
unnecessary in the source tarball. Removing them makes "cabal sdist"
work in clean checkout.
]
[Update the install-deps script to work with Cabal 1.8.
Petr Rockai <me@mornfall.net>**20100302221215
Ignore-this: 4d5f29b28f09727d3686bc9883c88878
]
[fix issue458.sh failing on systems with xattrs
Jens Petersen <petersen@redhat.com>**20100305052023
Ignore-this: 8dd7c366bf87f3f9106974e66cdccbe6
Systems with selinux or other extended fs attributes give output
with trailing-dot like "-rw-------." instead of "-rw-------".
The change just filters off any trailing "." with sed.
]
[Resolve issue1755: fix apparent hard line break in homepage.
Eric Kow <kowey@darcs.net>**20100301152459
Ignore-this: 673fd7b5e9b2c023a7940464feb7d979
I'm not entirely clear on why this should work, as the document
is supposed to be XHTML. Thanks to Wagner Ferenc for pointing
out the solution!
]
[Add a darcs get link to the homepage.
Eric Kow <kowey@darcs.net>**20100301134519
Ignore-this: 3f3f789429f86dcbb9487e5651286443
]
[update link to stable source
Ganesh Sittampalam <ganesh@earth.li>**20100227224104
Ignore-this: 4ae61bd0c5fae4f056e9bf2e546effcc
]
[resolve conflict in index.html
Ganesh Sittampalam <ganesh@earth.li>**20100227222851
Ignore-this: e899f6fbadc1f21724c459ce406ab042
]
[Add 2.4 release announcement to web site
Reinier Lamers <tux_rocker@reinier.de>**20100227115055
Ignore-this: 38945035d233abb0565c16785e67fa9f
]
[TAG 2.4
Reinier Lamers <tux_rocker@reinier.de>**20100226180900
Ignore-this: 36ce0456c214345f55a7bc5fc142e985
]
[Bump version number for 2.4 release
Reinier Lamers <tux_rocker@reinier.de>**20100226180835
Ignore-this: 14c4b29514f630cd481526c848b67dec
]
[Restore import of Origin needed for witness builds.
Eric Kow <kowey@darcs.net>**20100224203351
Ignore-this: a41dbc86bd32a67df437223badc6e213
]
[fix unused imports warnings
Benedikt Schmidt <beschmi@gmail.com>**20100214083818
Ignore-this: f3c4c975434d038e6a6b7aa505c9b916
]
[TAG 2.3.99.2
Reinier Lamers <tux_rocker@reinier.de>**20100218180015
Ignore-this: b0f18efa7fef5783a6bc43604e39ab3c
]
[Bump version number for darcs 2.4 rc2
Reinier Lamers <tux_rocker@reinier.de>**20100217174410
Ignore-this: 9cfefc951b06be056c67bd7ba708c45c
]
[resolve issue1731: bump the hashed-storage dependency once more
Reinier Lamers <tux_rocker@reinier.de>**20100217073217
Ignore-this: 138c469beabd2794ccc4cffddc0d1512
]
[TAG 2.3.99.1
Reinier Lamers <tux_rocker@reinier.de>**20100131140210
Ignore-this: 3286e77a4d0227a1265f6e8356b813e4
]
[Bump verson for 2.4rc1
Reinier Lamers <tux_rocker@reinier.de>**20100131140129
Ignore-this: b4b458d17a54105efb8382453da37339
]
[TAG 2.3.98.3
Reinier Lamers <tux_rocker@reinier.de>**20100126101458
Ignore-this: eb49d49537d842e4556b177adb720c19
]
[Bump version number for darcs 2.4 beta 3
Reinier Lamers <tux_rocker@reinier.de>**20100126101444
Ignore-this: 7d54bed6197e5f6f33cba1c284deba66
]
[TAG 2.3.98.2
Reinier Lamers <tux_rocker@reinier.de>**20100117211225
Ignore-this: 6b00150eff9b4cbf81db6e2dabd336ad
]
[Bump version number for darcs 2.4 beta 2
Reinier Lamers <tux_rocker@reinier.de>**20100117210712
Ignore-this: 77433e80bd8f29c261ac344684a02310
]
[TAG 2.3.98.1
Reinier Lamers <tux_rocker@reinier.de>**20100103150819
Ignore-this: def816d83bf49dc3bc16c7473323385f
]
[Bump version for 2.4 beta 1
Reinier Lamers <tux_rocker@reinier.de>**20100103150736
Ignore-this: b6ec028ca2c4722cece9a46b6872c329
]
[Purge unused bits of checkpoint reading.
Petr Rockai <me@mornfall.net>**20100212101946
Ignore-this: f13352b4e4c2c19a5b598001966b6891
]
[Add a missing Functor constraint on ReadableDirectory TreeMonad instance.
Petr Rockai <me@mornfall.net>**20100210235039
Ignore-this: 951c03c12a89d89b4c67a987b876663c
]
[Replace Slurpy usage in Commands.Diff.
Petr Rockai <me@mornfall.net>**20100208182027
Ignore-this: 5f21f441a96d0848edc015972426a29d
]
[Remove unused force_replace_slurpy.
Petr Rockai <me@mornfall.net>**20091116080225
Ignore-this: 96647125058765f7e59f1e645f553f8c
]
[Accept issue1740: darcs is confused if you move a tracked dir.
Eric Kow <kowey@darcs.net>**20100208150632
Ignore-this: 261c70603212f3dfa7d8824f6beb6aa1
]
[Rename and adjust issue 1749 tests now that it succeeds
Reinier Lamers <tux_rocker@reinier.de>**20100221113933
Ignore-this: f6cdd7665dc6f18ee26f1b85ccf58f70
]
[resolve issue1749: refuse to remove nonempty directories in makeRemovePatch
Reinier Lamers <tux_rocker@reinier.de>**20100221113357
Ignore-this: ad57e75a8f336ca97a981e16933a74ea
]
[accept issue1749 - darcs remove <dir> can make broken patches
Ganesh Sittampalam <ganesh@earth.li>**20100220005547
Ignore-this: a4e39aabef93199397485d753fe80992
]
[Resolve issue1741: fix --list-options when option has multiple names.
Eric Kow <kowey@darcs.net>**20100217231135
Ignore-this: 11157398045f56e762a21a40af26289c
]
[Add a special thank-you to some of our bigger donors.
Eric Kow <kowey@darcs.net>**20100215142944
Ignore-this: 3b548b13803c4ac4835b4735f910b792
]
[Retire list of buildbot friends on thank-you page.
Eric Kow <kowey@darcs.net>**20100215142054
Ignore-this: 5ba4310672fd8caa574223a9de8657a8
I think we have to occasionally retire bits of the thank-you page to
accommodate more recent entries.
]
[CSS support for testimonials.
Eric Kow <kowey@darcs.net>**20100211120557
Ignore-this: a9f169253bf95b16a96d649ea0fba7a2
]
[News: darcs 2010 fundraising complete - we did it!
Eric Kow <kowey@darcs.net>**20100215081937
Ignore-this: c4c5aee9aca2536a8de88d37daf54f4e
]
[Point out upcoming Darcs 2.4 release on homepage news.
Eric Kow <kowey@darcs.net>**20100214204739
Ignore-this: 589fd5649c11f00a81efd28e3baa6d0b
]
[Add witnesses to Commands.Changes
Florent Becker <florent.becker@ens-lyon.org>**20100208150003
Ignore-this: 227a56c5e4194a180081e678241a931c
]
[Allow PatchSets not to start at the origin of the repo
Florent Becker <florent.becker@ens-lyon.org>**20100131215519
Ignore-this: 604b85a56a69aec994d81d7e20a1ea8d
]
[Remove useless case in Patch.Bundle
Florent Becker <florent.becker@ens-lyon.org>**20100131162539
Ignore-this: ace697c626b94e109ecd1dedff2e6058
]
[add seals in Changes to prepare for witnesses
Florent Becker <florent.becker@ens-lyon.org>**20100208144050
Ignore-this: 2a798d89a7a1d560eed8710bfd466aba
]
[Give Darcs.SelectChanges.text_view a sane type
Florent Becker <florent.becker@ens-lyon.org>**20100129095822
Ignore-this: a47f33f6a7f265ef5b6819b6776218f9
]
[Rename filterFL to filterFLFL, replace it with a version using Sealed2
Florent Becker <florent.becker@ens-lyon.org>**20100127131924
Ignore-this: 262689c3125ab67f2e9e334a10d2c750
]
[Camel case Darcs.RunCommand.
Eric Kow <kowey@darcs.net>**20100209131811
Ignore-this: 289c8c9f2a4185489669e04ed401621c
]
[Simplify sourcing of lib in EXAMPLE.sh.
Eric Kow <kowey@darcs.net>**20100208150505
Ignore-this: 68ae4d80537abdd6cde0ac142f9ebaba
The old way made sense when we had regression tests in different directories.
Now it just makes things cumbersome.
]
[resolve issue 1719
Florent Becker <florent.becker@ens-lyon.org>**20100105150215
Ignore-this: b90e43b1d3120b28261c7a5ff5056dc3
]
[Warn for extra patches before selection in apply
Florent Becker <florent.becker@ens-lyon.org>**20100105143046
Ignore-this: 70e488bade5ef86970a97d158f007bec
]
[In check, compare index path list against working, not pristine.
Petr Rockai <me@mornfall.net>**20100203102717
Ignore-this: 4f6fe81c86677964eb15088e4be090f8
]
[Remove default $20 donation as this confuses people.
Eric Kow <kowey@darcs.net>**20100203120706
Ignore-this: 129846c12c38ffce2918abad83cffd3b
]
[resolve issue1250: check for newlines in setpref values
Florent Becker <florent.becker@ens-lyon.org>**20100105141018
Ignore-this: ea1194357318edb8953e0387bfe5841d
]
[Camel case Darcs.Patch.ReadMonads.
Eric Kow <kowey@darcs.net>**20100122123736
Ignore-this: 2e462a282d79c13f8bc53f8e9e7f6b71
]
[haddock ReadMonads
Jason Dagit <dagit@codersbase.com>**20100113163357
Ignore-this: e664cf636d093ba71b60e766f99726e4
]
[Remove (unused) lazy parser monad
Jason Dagit <dagit@codersbase.com>**20100113162918
Ignore-this: c68d14ba2ad873d1edda71e9445bfcd7
]
[Further refine the split UI text.
Eric Kow <kowey@darcs.net>**20100121233025
Ignore-this: 1f6bbb81caf90eec6fd169d851db5e81
]
[Simpler and more intuitive help text for hunk editor.
Eric Kow <kowey@darcs.net>**20100120215101
Ignore-this: 8295fa18746221a9ec389c98f95af5c7
Note that we lead the user to only edit the second chunk of text;
but power users can still edit the first chunk if they like.
(Thanks to Petr Ročkai for suggestions on the text!)
]
[Improve online help for hunk-splitting.
Eric Kow <kowey@darcs.net>**20091229014506
Ignore-this: bf738600cf92d2466e339a63ca6c79f2
]
[Name the separators in the hunk splitting interface.
Eric Kow <kowey@darcs.net>**20091229012613
Ignore-this: b985d1fef1331e4eafa8730faf4b58f6
]
[Require Cabal 1.8, fix the build-deps dump in --exact-version.
Petr Rockai <me@mornfall.net>**20100120215158
Ignore-this: 42f643a0c36c6718580656f2dc4db6d
]
[Do more in makefile `clean' target.
Dave Love <fx@gnu.org>**20100109114916
Ignore-this: 82598bec9cb2ed442a2d031f7fbcae8
]
[switch to extensible exceptions
Ganesh Sittampalam <ganesh@earth.li>**20091216013022
Ignore-this: 14aecf51a3363031a4a6effbd6fec1bc
]
[Tidy up donations page a little bit.
Eric Kow <kowey@darcs.net>**20100119192754
Ignore-this: 2b4b15d6a18f79126ae0b61d8b128ce8
]
[Encourage more use of Google Checkout (no fees) for donations.
Eric Kow <kowey@darcs.net>**20100119192523
Ignore-this: b2b678ea4111206ff2e7611a88cee0d6
]
[resolve issue1731: bump hashed-storage dependency to 0.4.5
Reinier Lamers <tux_rocker@reinier.de>**20100117205223
Ignore-this: c6e300b3c56d85b425306530b4d6c7be
]
[Better characterisation of Eric's time.
Eric Kow <kowey@darcs.net>**20100118093217
Ignore-this: d933c93683620b8a19e3becdbddd2b02
]
[Include the exact package versions darcs was compiled with in --exact-version.
Petr Rockai <me@mornfall.net>**20100112205841
Ignore-this: ba32c0022e565cfa40ebe2bbc98ec1fa
]
[Fix typo in release script
Reinier Lamers <tux_rocker@reinier.de>**20100117211219
Ignore-this: 51b23e8cb72cc73d912c24a61a3fe7d6
]
[We should call "make website" before creating release tarballs.
Petr Rockai <me@mornfall.net>**20100112203130
Ignore-this: d5950a2fa4917fa251220a3186cd35c2
]
[Make "make website" work with clean doc/ as well.
Petr Rockai <me@mornfall.net>**20100112203048
Ignore-this: 5fd15f0b92f9b7c506b0659d15b79204
]
[Fix our version mechanism to make non-clean rebuilds pick up right version.
Petr Rockai <me@mornfall.net>**20100112203326
Ignore-this: d58d3132dc75b6bfee515a85919ce7a6
Since Cabal relies on ghc --make, changes in -D flags are not noticed in
dependency analysis and things do not get rebuild, which translates into stale
version numbers in produced darcs binaries (only --exact-version was correct in
the old system). We now tack the version information into a generated module
instead (header file changes are not noticed by ghc --make either). This
involves an ugly hack, since autogenerated modules cannot be listed in
other-modules, since this breaks sdist while at the same time, libraries have
to have all their modules listed to work. And the version information is part
of darcslib. The workaround involves tricking the sdist implementation into not
seeing the other-modules clause in the cabal file. This seems to work.
]
[Acknowledge NLTG group within Brighton for Eric's 20% time.
Eric Kow <kowey@darcs.net>**20100115183133
Ignore-this: 80e39dfb524254b65788e0cdbd7917c5
]
[Replace University of Brighton logo with crisper version.
Eric Kow <kowey@darcs.net>**20100115181902
Ignore-this: b29ba13b857ad21aacc0ee2c18af0c41
]
[Link to donations page from front page.
Eric Kow <kowey@darcs.net>**20100114172216
Ignore-this: b6f114f446d6277cff11d4cb12a5c9cf
]
[Resolve issue1677: require hashed-storage 0.4.4.
Petr Rockai <me@mornfall.net>**20100112144831
Ignore-this: 92a9def06cccee05dc1cbaa63b6ef6fa
This version of hashed-storage produces index with correct hashes for empty
directories (the previous versions would use zeroes as the hash instead of the
hash of empty string there, leading to hash mismatches in the index).
]
[Make release.sh handle beta releases correctly
Reinier Lamers <tux_rocker@reinier.de>**20100106175534
Ignore-this: 4557cfafedfe39b180fbe65263f691cf
]
[Resolve issue1720: Fix cabal haddock problem.
Dave Love <fx@gnu.org>**20100106162322
Ignore-this: 1521b3a742711ac3ee979efc765f6b61
]
[Resolve issue121: add --ask-deps support to amend-record
Ganesh Sittampalam <ganesh@earth.li>**20091228223636
Ignore-this: 8dc5e5728eb91e96db5fcc56c1a2d8f1
]
[list recently added modules in .cabal file
Ganesh Sittampalam <ganesh@earth.li>**20100101231726
Ignore-this: 6fa276c886c9e46beddee8dbf14c0b53
All modules must be listed in the library section for darcslib to actually
work, but we don't have any tests of that so a few were forgotten.
]
[remove utf-8 message-spam
Florent Becker <florent.becker@ens-lyon.org>**20091229113701
Ignore-this: 4991d2f7ccb928c6a3f579f18ae81115
]
[fill out witnesses.hs
Ganesh Sittampalam <ganesh@earth.li>**20091214143741
Ignore-this: 85a50958100ee291fb6670e857a71cdd
This just adds all modules to the list imported by witnesses.hs either
directly or indirectly, with some imports commented out since the modules
don't work with witnesses yet.
The idea is to make it easier to see what hasn't had witnesses added yet.
]
[Also import (<>)
Joachim Breitner <mail@joachim-breitner.de>**20091226202445
Ignore-this: 5893bb451135f4eacc506c273f9a7520
]
[Resolve issue1362: Mention repo name in mail send body
Joachim Breitner <mail@joachim-breitner.de>**20091224113444
Ignore-this: 3e5e0bbc5415b1b3d7c72ba3e8e077c8
]
[move witnesses code into its own namespace
Ganesh Sittampalam <ganesh@earth.li>**20091224142204
Ignore-this: 9da1b928857a322b34c77da3005f91a7
]
[simplify code
Ganesh Sittampalam <ganesh@earth.li>**20091208184343
Ignore-this: b0cc1c919a3e629c09e968d09fa2d0e5
]
[Change get_patches_beyond_tag so the return type matches the actual data
Ganesh Sittampalam <ganesh@earth.li>**20091214130619
Ignore-this: 88508e6e3dfb97aeb5a02d9809b54294
The outer RL was always a singleton.
]
[update comment
Ganesh Sittampalam <ganesh@earth.li>**20091211001622
Ignore-this: e27966b5e426452aacdbb4b907d9b6a3
]
[drop #ifdef
Ganesh Sittampalam <ganesh@earth.li>**20091211002558
Ignore-this: 8a2c4d284cc3a449201967ff25991a43
]
[drop a bunch of old C helper code
Ganesh Sittampalam <ganesh@earth.li>**20091124190145
Ignore-this: 635c00686df59473840a65b2d76f5883
]
[fix conflict between commutex -> commute rename and utf8-metadata
Florent Becker <florent.becker@ens-lyon.org>**20091218134217
Ignore-this: 36e29bec81129244975dbfd820790cc0
]
[Kill unused import warning in Darcs.Utils
Reinier Lamers <tux_rocker@reinier.de>**20091122174023
Ignore-this: a467c43dd666b5a8a2add7e7beab760
]
[Make darcs depend on a haskeline that doesn't choke on malformed UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20091122145038
Ignore-this: abc185f8d67f8c666acbdf78ba4660a1
]
[Fix another conflict between UTF-8 and main branch
Reinier Lamers <tux_rocker@reinier.de>**20091122144924
Ignore-this: 49c1b440c55ad797a9da67415f6921d3
]
[Autodetect UTF-8 encoded metadata
Reinier Lamers <tux_rocker@reinier.de>**20091115155304
Ignore-this: 6e1d6048fcf08a044076e0b20ad5e682
It adapts the unit tests accordingly.
]
[Resolve conflicts with import warnings and with the addition of a newline to the \
author file Reinier Lamers <tux_rocker@reinier.de>**20091109214809
Ignore-this: 2287539c9ec129cfb99105e180cc3b78
]
[Add tests for function of UTF-8 marker line and for NFC normalization
Reinier Lamers <tux_rocker@reinier.de>**20091101165936
Ignore-this: e3411834cfc81d53a821104dac8a20a7
]
[Stop handling all command line arguments as Unicode text
Reinier Lamers <tux_rocker@reinier.de>**20091101144836
Ignore-this: 36378aff05acba9cb1da5cb98b9b2793
]
[Add C wrappers for ICU functions to work around changing symbol names
Reinier Lamers <tux_rocker@reinier.de>**20091031214649
Ignore-this: 533d863a04caa0a3a7c7268400a83606
]
[Resolve conflict about the handling of the author pref file
Reinier Lamers <tux_rocker@reinier.de>**20091031212525
Ignore-this: 6d9d1b81780af984bb0517388941e771
]
[Resolve conflict with darcs-hs merge
Reinier Lamers <tux_rocker@reinier.de>**20091010212534
Ignore-this: a868ea1795626ae72b0ff756c448c09f
]
[Normalize Unicode of the patch metadata for comparison.
Reinier Lamers <tux_rocker@reinier.de>**20091007181812
Ignore-this: a4b0be23898a1f9cbb3feb7d309aed63
This also includes two other changes: the change from the utf8-string
package to the text package for encoding matters, and the change from a single
'Ignore-this' line to two separate ones for the hash and the UTF-8 marker.
]
[Test that patches with non-latin1 metadata can be safely moved between repos
Reinier Lamers <tux_rocker@reinier.de>**20091004113213
Ignore-this: 83acc078930dc42ec6d5225836ebcaef
]
[Move locale conversion out of IO monad
Reinier Lamers <tux_rocker@reinier.de>**20091004112511
Ignore-this: 831e4d0993e52ad6be1c0cc9d1a022c3
This is motivated by the circumstance that GHC 6.12 will offer locale
conversion with a pure type.
]
[Test that darcs tag stores metadata in UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20090927175836
Ignore-this: 4339aae7f53b40edf2e2237cda8c1b79
]
[Make _darcs/prefs/author be locale-encoded
Reinier Lamers <tux_rocker@reinier.de>**20090927175820
Ignore-this: 72dd25c4ce3e9ce8578085edf4b48a03
]
[Make amend-record store metadata as UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20090925162134
Ignore-this: 637ef55122360eb4a655dab758b9762b
]
[Add tests for rollback's storing metadata as UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20090925161841
Ignore-this: b76c41118719f1ba9fa0981fc21f709d
]
[Make UTF-8 test a bit more compact
Reinier Lamers <tux_rocker@reinier.de>**20090923090008
Ignore-this: 6d032b6a9658af21a313dc55e6e8904a
]
[Add tests to check that amend-record stores metadata in UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20090922200745
Ignore-this: 1cde8b52b4946c3a05b89c30481af2b5
]
[Resolve conflicts between UTF-8 and main branch
Reinier Lamers <tux_rocker@reinier.de>**20090922200654
Ignore-this: 6b882e6cdd1b0657b708098152cec1e1
]
[Add test for UTF-8 metadata
Reinier Lamers <tux_rocker@reinier.de>**20090917165327
Ignore-this: 3e81237e8af61a45d64ac60269e1fe90 UTF-8
]
[Make record store patch metadata in UTF-8
Reinier Lamers <tux_rocker@reinier.de>**20090917165301
Ignore-this: 6640e121987d6a76479e46d9cc14413b
]
[resolve issue1392: use parsec to parse .authorspelling
caitt@users.sourceforge.net**20091220224123
Ignore-this: 491f823882e9e2c9a49ad303ee6fb4ba
.authorspelling file is now parsed using parsec.
Parser reports errors (only affected line is discarded).
Added escaping of commas.
]
[fix the witnesses in prePushChatter
Ganesh Sittampalam <ganesh@earth.li>**20091219165001
Ignore-this: 9309619e546d8f1cb85f085e991fdae
]
[Resolve issue1712: darcs over-reports number of patches to pull
Luca Molteni <volothamp@gmail.com>**20091216230745
Ignore-this: b1d41e85de83e4dae03144ea9a361510
]
[remove unnecessary OPTIONS_GHC from Darcs/Commands/Record
Ganesh Sittampalam <ganesh@earth.li>**20091213233023
Ignore-this: f7af5b8faf14f8a645017de575f7eab1
This is needed to build this file on GHC 6.12, because there is a new
extension picked up by -fglasgow-exts that makes 'rec' a keyword, and
this file has a variable called that.
We should actually remove OPTIONS_GHC everywhere, but for now this is a
minimal step to fix the build.
]
[add ImpredicativeTypes to extensions
Ganesh Sittampalam <ganesh@earth.li>**20091213232922
Ignore-this: 8c73b05a8b0038d970c449ef094f7d8a
This is needed to build on GHC 6.12.
Before 6.14, we need to drop our uses of impredicativity as
this is now deprecated.
]
[add GADTs to witnesses build
Ganesh Sittampalam <ganesh@earth.li>**20091213214653
Ignore-this: a0def9ef02e1b8a359b3d4a14be25923
This extension is needed in many more files for GHC 6.12 which
requires that it is specified for any file that pattern
matches on GADTs as well as any file that defines them.
]
[bump dependency upper bounds for GHC 6.12
Ganesh Sittampalam <ganesh@earth.li>**20091213214613
Ignore-this: 73fffa554ba7fac293bdfe19fa886256
]
[Fix regression in interactive UI patch summary.
Eric Kow <kowey@darcs.net>**20091208151545
Ignore-this: 14b2651669678f49f92dfcd46ad7631
I confused a False with a True in my attempt at refactoring this code.
]
[resolve conflict
Ganesh Sittampalam <ganesh@earth.li>**20091213163138
Ignore-this: b3bb7faf1719604f994c03e721492041
]
[resolve issue835 show file with file directory arguments
Luca Molteni <volothamp@gmail.com>**20091209104221
Ignore-this: f702162c7c078714a4d318bacaf70513
]
[rename toCommute to toFwdCommute and fromCommute to toRevCommute
Jason Dagit <dagit@codersbase.com>**20091207225216
Ignore-this: 9e2a43b5e28107c6e2ece192030ca575
]
[remove no longer meaningful comments
Jason Dagit <dagit@codersbase.com>**20091207220000
Ignore-this: 5f218698b6798e52b557b91966af96fe
]
[remove commutex
Jason Dagit <dagit@codersbase.com>**20091115070356
Ignore-this: dd35696f3202bab8573669254debf765
]
[Reconciliate show version with CamelCasings
Florent Becker <florent.becker@ens-lyon.org>**20091211105637
Ignore-this: 484ad4f6520a2e5d0f1edebc169ffdf6
]
[sensible defaults for versioned show files
thomashartman1@gmail.com**20091125222845
Ignore-this: 894194a59a0e0b940787ed5539588f30
]
[add versioned show files functionality (darcs show files -p 'some patch')
thomashartman1@gmail.com**20091116013206
Ignore-this: b746813de79050f3101f822324c3e6f5
]
[LaTeX typo: \verbXfooX, not \verbXfoo\verbX.
Trent W. Buck <trentbuck@gmail.com>**20091209022043
Ignore-this: f8fca53f1c4b7a4f7ab05e479aa19183
]
[Contribute vc-darcs.el for Emacs VC support.
Dave Love <fx@gnu.org>**20091209232206
Ignore-this: c602b384e866566ffdd6f0338cf490d4
The Emacs maintainers rejected the Darcs support (despite supporting
the other major free VCSs) :-(. Distributing it with Darcs makes it
reasonable to drop support for old Darcs versions later and possibly
take advantage of additional features to support it, but means we have
to track incompatible changes in Emacs.
Please take care only to include changes covered by an appropriate FSF
assignment/disclaimer, though, in case it ever can get into Emacs.
]
[Resolve issue1594: define PREPROCHTML in makefile
Dave Love <fx@gnu.org>**20091123162006
Ignore-this: ef15cf620728b30c141afb07e0d0ce1d
]
[resolve issue1709: Short version of progress reporting was wrong.
quiark@centrum.cz**20091202183645
Ignore-this: 51065958e4b46269e82e95876e5a82a2
]
[Resolve issue1336: poor error message on --last "" (empty string to numbers parser)
David Markvica <david@blueshellturtle.com>**20091115175546
Ignore-this: 93b2708bc87ea0a8aefc49732455b14e
]
[Resolve issue 1424: darcs get wrongly reports "using lazy repository" if you ctrl-c \
old-fashioned get David Markvica <david@blueshellturtle.com>**20091114214132
Ignore-this: e10e449b856ba9bc722bee26134e3aeb
]
[Resolve issue1216: list Match section in ToC.
Trent W. Buck <trentbuck@gmail.com>**20091130065321
Ignore-this: edebeeefc69d60a18c13a7c2358da57
]
[Less implementation-oriented haddock for Darcs.Patch.Choices.
Eric Kow <kowey@darcs.net>**20091124011234
Ignore-this: 49ee5781d14ea0b77b15039765241993
]
[Accept issue1702: optimize --relink doesn't relink the cache.
Trent W. Buck <trentbuck@gmail.com>**20091125051641
Ignore-this: c84443acb3486b4ea99d6b435545ab1b
]
[Allow --no-foo to negate all --foo options
Florent Becker <florent.becker@ens-lyon.org>**20091120160307
Ignore-this: e42f33bf1412ec0a76f7af683a46dc71
]
[Consistently use "no-" prefix for new negative flags
Florent Becker <florent.becker@ens-lyon.org>**20091120155020
Ignore-this: 43efbc7ddfd0eb2a7dc182bfc1a0c296
]
[Add --to-all-files option to darcs changes
Florent Becker <florent.becker@ens-lyon.org>**20091111215707
Ignore-this: 187c74a85f00df873220bf7675e2e7be
]
[add --forward (opposite of --reverse)
Florent Becker <florent.becker@ens-lyon.org>**20091111212744
Ignore-this: 943c48e02bd3873b62fbfa76abfe522a
]
[add --case-cautious and --reserved-cautions
Florent Becker <florent.becker@ens-lyon.org>**20091111205915
Ignore-this: 642289206e1d6904b98f34ff3c9731ec
]
[add --skip-boring
Florent Becker <florent.becker@ens-lyon.org>**20091111203344
Ignore-this: df4b509ec77271f4a55824a117964509
]
[clean up queries in Darcs.Flags
Florent Becker <florent.becker@ens-lyon.org>**20091111202046
Ignore-this: f825cbe291f3ee5ee2e73cc7d45d9e91
]
[add --no-happy-forwarding
Florent Becker <florent.becker@ens-lyon.org>**20091111195443
Ignore-this: 8412956ba7554e76b36744839bcc3657
]
[add --apply-on-disk as counterpart to --store-in-memory
Florent Becker <florent.becker@ens-lyon.org>**20091111192804
Ignore-this: c02d827d3c2cd56f79d8ed2b4adefc60
]
[add a --traditional counterpart to --unified
Florent Becker <florent.becker@ens-lyon.org>**20091111182301
Ignore-this: db42f3c4650a79fd901a9c4cdd594807
]
[add --dont-delete-log-file option
Florent Becker <florent.becker@ens-lyon.org>**20091111172739
Ignore-this: 9eba00d701fe068b625646fdefd937a2
]
[Add --dont-ignore-times counterpart to --ignore-times
Florent Becker <florent.becker@ens-lyon.org>**20091111163250
Ignore-this: dae02e31b456843e55c5600cfa2d3f2c
]
[Accept issue1325: hunk patches interfere with pending minimisation.
Eric Kow <kowey@darcs.net>**20091010215038
Ignore-this: 27d84309f9189ca362c5ad89bb000f9c
The test creates the following pending sandwich:
add dir, move file to dir, delete dir
Ideally this should crush down to just removing the file. But this only
happens if the file is empty. Note that we perform this test twice,
once with an empty file and once with a non-empty file.
]
[Camel case Darcs.Match and its exports.
Eric Kow <kowey@darcs.net>**20091127161527
Ignore-this: dad9b7b1feb1b670b79863d4d41a3665
]
[Camel case Darcs.Repository.Format and its exports.
Eric Kow <kowey@darcs.net>**20091127161152
Ignore-this: d8a8a5383cbfd96a97f23f30b4c793a6
]
[Camel case Darcs.Commands and its exports.
Eric Kow <kowey@darcs.net>**20091127160700
Ignore-this: d4e6e87f8936d34e57c34fd447b17a9
]
[Camel case Darcs.Commands.* and their exports.
Eric Kow <kowey@darcs.net>**20091127155852
Ignore-this: c7bbb91909da7a9bba1707f7dbbe8db5
]
[Camel case helper functions exported by Darcs.Commands.Help.
Eric Kow <kowey@darcs.net>**20091127155037
Ignore-this: 37c951c7c8561dac0c93da0a184db92d
]
[Camel case Darcs.Arguments and exports.
Eric Kow <kowey@darcs.net>**20091127144549
Ignore-this: 1006be4fc8503ff63c274090571ea6bb
]
[Camel case Darcs.Patch exported functions.
Eric Kow <kowey@darcs.net>**20091126133554
Ignore-this: 1e3f790520118cee9f5cf1da4a3c9950
]
[Camel case and rename Prim patch predicates.
Eric Kow <kowey@darcs.net>**20091126133325
Ignore-this: c24c2244bb703da29b984752da8078ae
The problem is that we can't just replace is_hunk with isHunk because the
latter already exists.
]
[resolve issue223, add --remote-darcs flag for remote darcs executable
Benedikt Huber **20091118155649
Ignore-this: adb6bdc8ae27f98c63b8a39ba8eb750
This patch adds a flag '--remote-darcs COMMAND' to specify the name of the darcs
executable on the remote end. Unfortunately it currently only works for remote \
apply, not for the transfer mode optimization. The problem: SSH transfers are used \
at many points in darcs (eg, HashedIO), where transfer flags are not available.
The relevant starting points for fixing this are '[gz]fetchFilePS' in External.hs.
]
[Appease haddock.
Trent W. Buck <trentbuck@gmail.com>**20091122140135
Ignore-this: 3240a0b6731ea0776deab72a85e97cd5
]
[Add myself to .authorspelling file.
caitt@users.sourceforge.net**20091121234524
Ignore-this: 32ad53f042bf813141fe53b184a0913f
]
[More elaborate test for repair of a corrupt repository.
Petr Rockai <me@mornfall.net>**20091114170300
Ignore-this: 3d38d136544b183e4a92f7dda0d4d52e
]
[resolve issue1377: getProgname for local darcs instances
Benedikt Huber **20091117141754
Ignore-this: d46f7d47fa663c8b68ab4a930ceb3e2e
]
[replace commutex with commute in elegant_merge
Jason Dagit <dagit@codersbase.com>**20091114224243
Ignore-this: 8d36808ae0de97a06fd4df9e401d7084
]
[clean up elegant_merge
Jason Dagit <dagit@codersbase.com>**20091114223105
Ignore-this: f85926d47fde8463588b72fa9323b2e0
]
[resolve issue1308 push should warn about unpulled patches *before* patch-selection
Luca Molteni <volothamp@gmail.com>**20091115102701
Ignore-this: 1f6fe64ad5cd84e7a8cae4261fcfa018
]
[Add --dry-run to obliterate, since you'd better be sure
Florent Becker <florent.becker@ens-lyon.org>**20091113075346
Ignore-this: 80d665adf9a83670c9f02bed6d84b508
]
[use guards instead of ifs
pivo@pobox.sk**20091115160941
Ignore-this: 5f514b01da4bd16642ce95a15b771ece
]
[Hlint away a concatMap.
Eric Kow <kowey@darcs.net>**20091114145408
Ignore-this: 43ea48bfe88923269cef6ea5b23f159f
]
[Replace a (sequence.map) with mapM per hlint.
Eric Kow <kowey@darcs.net>**20091114144151
Ignore-this: 2f8f50b6454a93639c784d0d0bd6f44e
]
[hlint error: Use unless
Joachim Breitner <mail@joachim-breitner.de>**20091115191633
Ignore-this: 16bc27e5225eba5206a2ff06a1a41e90
]
[hlint error: Use unless
Joachim Breitner <mail@joachim-breitner.de>**20091115152810
Ignore-this: c19c03cd0cdb6e5b8933c826f471b74b
]
[Camel-case helper functions exported by Darcs.Commands.
Eric Kow <kowey@darcs.net>**20091115191609
Ignore-this: 9555d3e3ea975ae6522f6e15bf015b8f
]
[Camel case Darcs.Commands.CommandControl constructors.
Eric Kow <kowey@darcs.net>**20091031214316
Ignore-this: e6119aa8845c89e43f568fb354c9c376
]
[hlint warning: Use mapM instead of sequence
Joachim Breitner <mail@joachim-breitner.de>**20091115193111
Ignore-this: 5674de4437e98d484064f61e20818324
]
[Drop Commands.Remove from witnesses for now.
Petr Rockai <me@mornfall.net>**20091116130710
Ignore-this: d69aee8d500ec99f35ea56b180a061a7
It now imports Add, which is not witness-enabled. The best fix would be to
witness-enable Add as well, but this should at least fix the current witness
breakage.
]
[Updates to thank-you page: ilbot, donors, tweaks.
Eric Kow <kowey@darcs.net>**20091103183342
Ignore-this: c729a612ea642a88d7229e4a4696b597
]
[Resolve issue540: darcs remove --recursive
quiark@centrum.cz**20091115192344
Ignore-this: 1c1bf04aef237e7b82b2fad4d45a0840
]
[Remove does not fail only warns on already removed or not added files.
quiark@centrum.cz**20091115172010
Ignore-this: 97721db92db7f8758922cdd1582f6276
]
[hlint error: Use first instead of ***
Joachim Breitner <mail@joachim-breitner.de>**20091115144513
Ignore-this: c19b8017696fee21ed4bb518b1fd6988
]
[resolve issue1643: optimize --upgrade should do optimize
Christian Berrer <christian.berrer@gmx.at>**20091115123716
Ignore-this: f437be2563974f9dad8576482797d23b
]
[resolve issue1122: get --complete should not offer to create a lazy repository
David Markvica <david@blueshellturtle.com>**20091115160201
Ignore-this: da8a1d30869e6153c027ae396cc74d56
]
[Fix a missing import after rushing a push of a hlint fix.
Petr Rockai <me@mornfall.net>**20091115160550
Ignore-this: fc9f2a4dd2dfda2650feb3ef9e347768
]
[hlint warning: Use isPrefixOf
Joachim Breitner <mail@joachim-breitner.de>**20091115151706
Ignore-this: 9495dfcf9c7bc1750c580dccbaff05fb
]
[hlint: span instead of break
Joachim Breitner <mail@joachim-breitner.de>**20091115142404
Ignore-this: 85126abaf3f94a928d260b428d26bcde
(darcswatch/roundup integration test patch, but still useful)
]
[Rollback Kim's test harness improvements. :-(
Eric Kow <kowey@darcs.net>**20091115152744
Ignore-this: 21f4a89439cefa790ff3f52b9170481
The problem is that not everybody has the new time package so this
would effectively break 'cabal install darcs'.
rolling back:
Sat Nov 14 23:55:23 CET 2009 Kim Wallmark <kim_darcsnet@arlim.org>
* Annotate long-running tests to make optimization easier.
See http://bugs.darcs.net/issue1394
M ./Distribution/ShellHarness.hs -1 +11
]
[Annotate long-running tests to make optimization easier.
Kim Wallmark <kim_darcsnet@arlim.org>**20091114225523
Ignore-this: 7de2385c13b074baf119b7fe68ec62a4
See http://bugs.darcs.net/issue1394
]
[Add a section title to distinguish darcs stuff from standard boring.
Eric Kow <kowey@darcs.net>**20091115085339
Ignore-this: 2e052d6d0d2cb7646dcfc910b372545e
]
[Use a custom boring file to get rid of tests-* and friends.
Petr Rockai <me@mornfall.net>**20091114085144
Ignore-this: c3ca3f3ece042640580395ca5d903df2
]
[little fix with hlint - changed map to all
Luca Molteni <volothamp@gmail.com>**20091114092250]
[Add a comment to the performGC workaround in amNotInRepository function.
Petr Rockai <me@mornfall.net>**20091115085903
Ignore-this: c4b520f2d6cd2fbcfbf4795f0ee5d9d8
]
[Workaround a System.Directory.createDirectory issue.
Salvatore Insalaco <kirby81@gmail.com>**20091114161658
Ignore-this: d8d0ce4e6c5b36484b46ed3b43993dc6
]
[Resolve issue1224: refuse to convert a repo that's already in darcs-2 format.
caitt@users.sourceforge.net**20091114152920
Ignore-this: c041609d2b4a5815a309b572956185ec
]
[Bump the hashed-storage dependency to >= 0.4.2.
Petr Rockai <me@mornfall.net>**20091114172021
Ignore-this: 6b579a668ab03185e08bb99635553aca
]
[fix -Wall warnings
Benedikt Schmidt <beschmi@gmail.com>**20091114150539
Ignore-this: 47d0ee669304e0bde13add9a3d4ee8ec
]
[Issue 1500: Providing more informative message about the nature of progress numbers.
quiark@centrum.cz**20091114150900
Ignore-this: 7f56c72e3d387ce878f78912a24e35ac
]
[test fix for OSX
Kamil Dworakowski <kamil@dworakowski.name>**20091114113610
Ignore-this: 43aae9f6ae527617845c9c1bb1180c18
]
[HLint test: new comment syntax, new ignored warnings
Benedikt Huber **20091114085111
Ignore-this: 82ed9eda12b9a0cf16c7defd5a40989d
]
[resolve issue1636: match hunk
Kamil Dworakowski <kamil@dworakowski.name>**20091025122954
Ignore-this: 75a9305d62af67e1f20df1c24e729ba3
A new primitive match type.
By Kamil and tat.wright
]
[accept issue1636 match hunk
Kamil Dworakowski <kamil@dworakowski.name>**20091017165928
Ignore-this: cbf726b778a4541d4e3a65d207f9d584
Add primitive match type to select patches which contain
a given regex in some of their hunks.
]
[remove trailing whitespace
Kamil Dworakowski <kamil@dworakowski.name>**20091003165321
Ignore-this: 6d0a2c2a844da8f6e7d658ab878266df
]
[Resolve issue1659: Make restrictBoring take recorded state into account.
Petr Rockai <me@mornfall.net>**20091105224138
Ignore-this: a546eb6e27adf19a591e7a0c5e7b126
It is possible that boring files are part of the repository and we need to
account for that by not filtering those files away in the boring filter.
]
[Camel-case functions exported by Darcs.Repository.Prefs (and some more).
Eric Kow <kowey@darcs.net>**20091031202137
Ignore-this: a45bed6bb4f3b7dec67cd44fd0630512
]
[Haddock Darcs.Patch.Non addP and addPs.
Eric Kow <kowey@darcs.net>**20091011154306
Ignore-this: 68ca7bd4bb2cbaba0d31d13ab124f6a3
]
[Haddock the Darcs.Patch.Commute class a little bit.
Eric Kow <kowey@darcs.net>**20090419115951
Ignore-this: 34c31031774e030b5e30ca00d15c4b49
]
[Obliterate replacePristineFromSlurpy (prefer replacePristine).
Petr Rockai <me@mornfall.net>**20091024144221
Ignore-this: 935d29ae5a60294dcef49322b903c0b0
]
[Fix a number of unused import warnings.
Petr Rockai <me@mornfall.net>**20091024144157
Ignore-this: c0f4e2ea044b28a5ac642188fc6b8fe5
]
[Leverage replacePristine in optimize --pristine implementation.
Petr Rockai <me@mornfall.net>**20091024131945
Ignore-this: 5d1d17e9b4807074e33feb2128a490c9
]
[Fix replacePristine implementation on hashed repositories.
Petr Rockai <me@mornfall.net>**20091024131825
Ignore-this: fcadf113b54397d9b8a19b395aa7fb75
]
[A vastly more efficient implementation of LookForAdds.
Petr Rockai <me@mornfall.net>**20091025143536
Ignore-this: ac7fe48eca1a546d268c001a1ee54e0e
]
[Bump the hashed-storage dependency to >= 0.4.1.
Petr Rockai <me@mornfall.net>**20091025143507
Ignore-this: f864fe06f2141e09f82b7fc6374f0e32
]
[Refactor Darcs.Commands.Send
Florent Becker <florent.becker@ens-lyon.org>**20091015130743
Ignore-this: 4f5bf11ead522774d5fec4a647b68e00
]
[Refactor Darcs.Commands.Push
Florent Becker <florent.becker@ens-lyon.org>**20091015082818
Ignore-this: 407791aa8c943d3b11fdae58fad381dd
]
[Make applyItNow type signature work with GHC 6.8.3.
Eric Kow <kowey@darcs.net>**20091101172727
Ignore-this: 8aa4d5060e12b14592c628bbb25d805e
]
[Fix import conflict between Florent and Ganesh's patches.
Eric Kow <kowey@darcs.net>**20091101113443
Ignore-this: 416a18c2ba511eb8f09f97d29553507f
]
[Refactor Darcs.Commands.Apply
Florent Becker <florent.becker@ens-lyon.org>**20091008150429
Ignore-this: a5640be910c748ddfb1abdcf139e8168
]
[Add an extra newline in help text stored in author prefs.
Eric Kow <kowey@darcs.net>**20091031204617
Ignore-this: 129fcfa77b9674022bcfc3484c0884f9
This is for readability in the authors file.
]
[Refactor Darcs.Commands.AmendRecord
Florent Becker <florent.becker@ens-lyon.org>**20091015123619
Ignore-this: ff49a1b62bf6f742baadc40135b725c9
]
[Refactor Darcs.Commands.Rollback
Florent Becker <florent.becker@ens-lyon.org>**20091014135055
Ignore-this: b7bc2df749cd899b049df03ba6619d8c
]
[Remove useless import of Verbose in Darcs.Commands.Unrecord
Florent Becker <florent.becker@ens-lyon.org>**20091014125045
Ignore-this: 103705111b7c889e7af01529fc36ddde
]
[Partially rewrite "darcs record" help.
Trent W. Buck <trentbuck@gmail.com>**20091011072907
Ignore-this: 24faa598373a1e635068748d420202cf
]
[Rewrite $DARCS_EMAIL documentation.
Trent W. Buck <trentbuck@gmail.com>**20090920131402
Ignore-this: 1effc6cdcaed085edb4100b1a61bb712
]
[Canonize Kari Hoijarvi, Matthias Fischmann, Thomas Hartman.
Eric Kow <kowey@darcs.net>**20091010221440
Ignore-this: f175872b795f3860f276ae5174636d2d
Also update Benedikt Schmidt and Marco Túlio Gontijo e Silva.
]
[Resolve issue1554: allow opt-out of -threaded (fix ARM builds).
Trent W. Buck <trentbuck@gmail.com>**20091031083717
Ignore-this: 19823ea41b53b5b6ef2a3b5c19de7516
GHC doesn't support -threaded on some architectures.
This patch allows -f-threaded, so Darcs will compile again.
]
[Typo: s/legal time/legal people/.
Trent W. Buck <trentbuck@gmail.com>**20091031112323
Ignore-this: 7bda0f632143dd3fd16a17a8530f8392
]
[Generalize, tidy up and expand license exceptions file.
Eric Kow <kowey@darcs.net>**20091010220606
Ignore-this: 70c49d2f2a13e91eb90e5c940c4979ca
]
[rename a local variable that doesn't have to be a list
Ganesh Sittampalam <ganesh@earth.li>**20091031105902
Ignore-this: 67c627ced353c0218cb0a003c74c975b
]
[Cabal flag for static binary (-fstatic)
Eric Kow <kowey@darcs.net>**20091030094621
Ignore-this: e1c90c4ee7095c6b123f6b795f7ad9b1
]
[add some haddock and rename a variable
Ganesh Sittampalam <ganesh@earth.li>**20091029214323
Ignore-this: d2f569cc8c417f5f0c1fb01509d002a2
]
[Resolve issue1588: add --skip-conflicts option
Ganesh Sittampalam <ganesh@earth.li>**20091026181917
Ignore-this: 37b99f7461efe229cf5c601e197a5ca7
This option is for both pull and apply, and causes any patches that would
cause conflicts to be skipped, either in interactive selection or by --all.
]
[Simplify donations page and make look more like other pages.
Eric Kow <kowey@darcs.net>**20091024173828
Ignore-this: ad605ae27916b23578dfc086fcaa588
]
[Resolve issue1563: official thank-you page.
Eric Kow <kowey@darcs.net>**20091024173132
Ignore-this: 8783f87868458c5562c1e94f8bc48cbf
]
[Simplify OT convergence test.
Eric Kow <kowey@darcs.net>**20091021095247
Ignore-this: 2a118a47311ebb277f8b0571b056abd7
]
[Accept issue1645: w -l should ignore symlinks.
Trent W. Buck <trentbuck@gmail.com>**20091011053838
Ignore-this: ffaacd9f9ee93303b837a0f472636dfc
]
[Update links to wiki in README.
Eric Kow <kowey@darcs.net>**20091020073349
Ignore-this: d84716f510368214e04049930ffed27f
]
[Resolve issue1652: suggest cabal update before cabal install.
Eric Kow <kowey@darcs.net>**20091020073105
Ignore-this: de39107c4c324ee83d1a63d950e83a1c
]
[Convert contextual patch printing from Slurpy to TreeIO.
Petr Rockai <me@mornfall.net>**20091019223402
Ignore-this: 41151f22e5c2183a63ec7907d8678755
This obliterates another major source of SlurpDirectory usage in darcs. I agree
the code has become a little more hairy, although this should be addressable by
a slight refactor of virtualTreeIO and friends in hashed-storage (there's
currently no reasonable way to create a sub-monad in TreeIO).
]
[Port list_* in Darcs.Arguments to Tree (away from Slurpy).
Petr Rockai <me@mornfall.net>**20091013104523
Ignore-this: 435b566db26fb05d701f6af2db7683d4
]
[Move a couple of low-level pending bits to (new) Repository.LowLevel.
Petr Rockai <me@mornfall.net>**20091013102853
Ignore-this: c551781b8a5ff4039d5fbe01ccb79e1c
]
[Use Commands.putInfo in Get
Florent Becker <florent.becker@ens-lyon.org>**20091006163121
Ignore-this: 963b2f5a4eae94ecf541e083fe1e3b17
]
[remove Darcs.Commands.Loggers
Florent Becker <florent.becker@ens-lyon.org>**20091008143843
Ignore-this: a842d151779adff2fa3dc62cb3dbd5ee
]
[Use Commands.put* in Darcs.Commands.Put
Florent Becker <florent.becker@ens-lyon.org>**20091002114915
Ignore-this: 6315abca3c4187def549e3ddc3b3880
]
[Use Commands.put* in Send
Florent Becker <florent.becker@ens-lyon.org>**20090930125215
Ignore-this: eac3d780d4260cff4be6fdc8ee8cb7a2
]
[Use Commands.putInfo in Push
Florent Becker <florent.becker@ens-lyon.org>**20091005141358
Ignore-this: 4d7c87c69e6601d99ecc49d1d67512cf
]
[Use Commands.putInfo in Check
Florent Becker <florent.becker@ens-lyon.org>**20091008141830
Ignore-this: ac856fb051e1ac4919aaf555a1c63728
]
[use Commands.put* in Convert
Florent Becker <florent.becker@ens-lyon.org>**20090929143942
Ignore-this: b442184cc2c6da67e3eeae52832cfc52
]
[Use Darcs.Commands.putVerbose in Apply
Florent Becker <florent.becker@ens-lyon.org>**20091008140754
Ignore-this: ca622866f4e7bf122e5c6b0e6f077ba0
]
[Use new Darcs.Commands.Put* in Add
Florent Becker <florent.becker@ens-lyon.org>**20091008135409
Ignore-this: 22116c4cea0c5601bb5c4fa53dbdc6ac
]
[typo in Hopefully.lhs
Florent Becker <florent.becker@ens-lyon.org>**20090922143044
Ignore-this: 935b1906e53d2fa700f4d3f17ed62aca
]
[Haddock documentation for Darcs.Patch.Core.Named
Florent Becker <florent.becker@ens-lyon.org>**20090918122203
Ignore-this: 735d685fb7072a38302e987dbec85fea
]
[add utility functions to Commands.lhs
Florent Becker <florent.becker@ens-lyon.org>**20090928130619
Ignore-this: 856f9f8edb2e4aae13248e16bbd0e51c
]
[fix warnings
Ganesh Sittampalam <ganesh@earth.li>**20091008223215
Ignore-this: 4d23b80ae383bae9a80a14ec075f23f0
]
[Fix bug in show_contents.sh test.
Eric Kow <kowey@darcs.net>**20091008121259
Ignore-this: b69c8ff84bbe05e9a1c61746fd2af020
It was in the wrong directory and was only passing due to being run within
the Darcs darcs repository.
]
[Remove redundant import of (</>).
Eric Kow <kowey@darcs.net>**20091007151050
Ignore-this: 8113ba9f56ebcd1d7a5adc1f636fa027
This also avoids a build error on Windows.
]
[Resolve conflicts in Commands.Remove.
Petr Rockai <me@mornfall.net>**20091005112459
Ignore-this: fee90e3bf4c0a80f86ec1cd6b16c0a42
]
[Resolve conflicts in Commands.Apply.
Petr Rockai <me@mornfall.net>**20091005112443
Ignore-this: 29b9db630ddfd3cc0117e0786cc275ea
]
[Resolve conflicts in Commands.AmendRecord.
Petr Rockai <me@mornfall.net>**20091005112410
Ignore-this: ee62b9758a009602b6807c97cfc9cf29
]
[Resolve conflicts in darcs.cabal.
Petr Rockai <me@mornfall.net>**20091005112358
Ignore-this: 1f4bf94965e19e3568c428360d0b47cb
]
[Replace uses of readDarcsPristine with readRecorded.
Petr Rockai <me@mornfall.net>**20091004174913
Ignore-this: ccedb958fb3bbcc95a512252cecda35c
]
[Use --ignore-times with check to skip index check.
Petr Rockai <me@mornfall.net>**20091004171627
Ignore-this: 149cbbe1e93d3802ce29cbb9d0820b4f
]
[Make readRecorded independent of hashed-storage's readDarcsPristine.
Petr Rockai <me@mornfall.net>**20091004171514
Ignore-this: c4e04b46ac32d00c4f4ba73f1c0abba9
]
[Add a bunch of haddocks to Repository.State.
Petr Rockai <me@mornfall.net>**20091001134622
Ignore-this: c8def50a9919a03f579f0e8165b7d5a9
]
[Resolve conflict between optimize --upgrade and optimize --pristine.
Petr Rockai <me@mornfall.net>**20091001085946
Ignore-this: f0717730f16d4079da42d23d01d209d6
]
[Resolve conflict in darcs.cabal (hashed-storage dependency).
Petr Rockai <me@mornfall.net>**20091001085931
Ignore-this: 6b89341c8d8a61b8dd9434a18591c69e
]
[Add a missing copyright notice to Darcs.Diff.
Petr Rockai <me@mornfall.net>**20090927154727
Ignore-this: 47c82bc3bc5d219b75f0da56e5d457bc
]
[allow State.hs to compile with type witnesses
Jason Dagit <dagit@codersbase.com>**20090925094029
Ignore-this: e9bbca73fc7a00ae8794af0790257f28
]
[Clarify that empty path list means everything, restrictSubpaths.
Petr Rockai <me@mornfall.net>**20090923165532
Ignore-this: efcd3d88bb1af54d1f6272994574bc57
]
[Don't forget to limit pending to relevant paths, in unrecordedChanges.
Petr Rockai <me@mornfall.net>**20090923165358
Ignore-this: 2ed0d1d4e14d63dbc16f9c0a77bcffcb
]
[Add Darcs.Diff and Darcs.Repository.State created in the Gorsvet refactor.
Petr Rockai <me@mornfall.net>**20090913180405
Ignore-this: c6f25a91f62cae0560d9be4820e03c53
]
[Remove the remnants of Gorsvet.
Petr Rockai <me@mornfall.net>**20090912201333
Ignore-this: a4725818943b1ef2d9084904a391da38
]
[Explode Gorsvet into a number of more appropriate places.
Petr Rockai <me@mornfall.net>**20090912193130
Ignore-this: 688515e833df250a8970f2ea3d182ae3
]
[Move the FooDirectory instances from Gorsvet to Darcs.IO.
Petr Rockai <me@mornfall.net>**20090912174204
Ignore-this: b2b488cffe725def2f29b22cd68d83d7
]
[Reformat the export list of Darcs.Repository.
Petr Rockai <me@mornfall.net>**20090912172909
Ignore-this: 5d6c450934ace601173d22c50f80ac99
]
[Resolve issue1488: darcs-hs does not suffer from this.
Petr Rockai <me@mornfall.net>**20090912152215
Ignore-this: 324d86a77cb45413d0d4c7b1159c62e1
]
[Unreadable pristine ought not be fatal for repair.
Petr Rockai <me@mornfall.net>**20090912151816
Ignore-this: 1c4d057e70d981bcf5711b8d1518117e
]
[Remove code for repair-from-checkpoint.
Petr Rockai <me@mornfall.net>**20090912150147
Ignore-this: 91fbb56fd69b801fa06eaa364e24afcb
]
[Update to latest hashed-storage API: updateIndex is global now.
Petr Rockai <me@mornfall.net>**20090912145934
Ignore-this: edcc0e4a74360bfc987fc2abe3249316
]
[Resolve conflict with haskell_policy -> hlint.
Petr Rockai <me@mornfall.net>**20090912145900
Ignore-this: 2c2e56fbc4bed294380b13fe7cc1cf96
]
[We no longer use pristine timestamps in any way.
Petr Rockai <me@mornfall.net>**20090912141442
Ignore-this: b2254899a231f7f151e5b2ab0e74a233
]
[Detect and fix bad index in darcs repair.
Petr Rockai <me@mornfall.net>**20090912101630
Ignore-this: 9e544484042571d40c5fbe7824ebeea8
]
[Drop unused import.
Petr Rockai <me@mornfall.net>**20090907180209
Ignore-this: ccd6913a37b63c0b6599eef7c4f66619
]
[Fix up for hashed-storage API shuffling.
Petr Rockai <me@mornfall.net>**20090907180144
Ignore-this: b79d289dea1ea663df0e665bba03eb9f
]
[Resolve conflict (duplicate, even) with Trent.
Petr Rockai <me@mornfall.net>**20090830102736
Ignore-this: 2149335dcfe81efea240f3818788cbd
]
[Resolve conflict with Eric's cleanup.
Petr Rockai <me@mornfall.net>**20090830102136
Ignore-this: 4608cf2a1d7c8265193b796ee1d9d248
]
[Remove extraneous invalidateIndex from revert.
Petr Rockai <me@mornfall.net>**20090811135655
Ignore-this: 4ea939685337e19946d587dc6d861614
]
[Add a --pristine option to optimize.
Petr Rockai <me@mornfall.net>**20090811105119
Ignore-this: aadae51b824aff9ea651e6312f0cff69
]
[Make darcs optimize rearrange pristine.hashed when needed.
Petr Rockai <me@mornfall.net>**20090810220600
Ignore-this: 4aeb09ca34c6189466a87ce3443a1c42
This is triggered when the pristine.hashed format uses the size-prefixed hash
format -- like 0000000064-<hash>. The optimize writes out a size-less pristine
tree that moreover uses stable (sorted by name) directory listing format, and
therefore stable directory hashes. This layout gives optimal performance with
HSI4-format index.
]
[Fix compilation after minor hashed-storage API rename.
Petr Rockai <me@mornfall.net>**20090808205346
Ignore-this: 9363a94075aeb18c32f64791d5f4da9b
]
[Use withDirectory to implement mInCurrentDirectory.
Petr Rockai <me@mornfall.net>**20090807185527
Ignore-this: 1013edaf34a06af97b639ed974295780
]
[Implement index checking functionality in darcs check.
Petr Rockai <me@mornfall.net>**20090807153017
Ignore-this: a0b7d0bca968a488da13e1473e892cb4
]
[Adapt to the new safety-improved readIndex API.
Petr Rockai <me@mornfall.net>**20090807101840
Ignore-this: 7117a8586ac358755708c8ff42735d2
]
[Add a testcase of diffing various trailing/missing newline combinations.
Petr Rockai <me@mornfall.net>**20090806141308
Ignore-this: 711a9bdf323d26a3550e650510425720
]
[Clean up unused bits and imports in Repository.Checkpoint.
Petr Rockai <me@mornfall.net>**20090806065904
Ignore-this: dacae1922b73496df181b98f5a3d2848
]
[Remove now-unused Darcs.Diff module.
Petr Rockai <me@mornfall.net>**20090806065216
Ignore-this: 94497dfcf962f405c004bc32c14ad311
]
[Use treeDiff in external_merge instead of unsafeDiff.
Petr Rockai <me@mornfall.net>**20090806065209
Ignore-this: 959f7c712d70abbd2337b0c35f300f38
]
[Remove unused syncPristine from Repository.Pristine.
Petr Rockai <me@mornfall.net>**20090806065139
Ignore-this: 7d9c88c4624889ddded767fb5fbedabd
]
[Take a Tree instead of Slurpy in external_resolution.
Petr Rockai <me@mornfall.net>**20090806064627
Ignore-this: d6dc217d813f87b615141590e142db40
]
[Preliminary version of the replace command with s/unsafeDiff/treeDiff/.
Petr Rockai <me@mornfall.net>**20090805194544
Ignore-this: ca952f6f1e994e49254ec622aefb088d
]
[Port to new readIndex interface in hashed-storage 0.4.
Petr Rockai <me@mornfall.net>**20090805183526
Ignore-this: a3f79f9e4aa80e8e532ab8674453d6cd
]
[Haddock invalidateIndex.
Petr Rockai <me@mornfall.net>**20090805183512
Ignore-this: 442fe0c54fe043f73a8ca378b49605e9
]
[Port to generalised Tree types (mostly just signature wibbling).
Petr Rockai <me@mornfall.net>**20090803084656
Ignore-this: c29c995e98c3ea6d76b74a01de1e21b5
]
[Get rid of wait_a_moment, since we do not use pristine timestamps anymore.
Petr Rockai <me@mornfall.net>**20090802122812
Ignore-this: edc0a7b42793e31ededc4d63a9ec5496
]
[Port to hashed-storage 0.4 Hash changes.
Petr Rockai <me@mornfall.net>**20090727105435
Ignore-this: 19a8b50253ba13056c7a4f535b1f6c50
]
[Obliterate timestamp manipulation in HashedIO.
Petr Rockai <me@mornfall.net>**20090720165836
Ignore-this: b98311e3ec5ca2d88d251ff2afe67b31
]
[Obliterate all instances of sync_repo and friends, since they are useless now.
Petr Rockai <me@mornfall.net>**20090720165700
Ignore-this: 9225b11cb51cd0a35a3db1df25548304
]
[Re-implement make_remove_patch in remove command, replacing Slurps with Trees.
Petr Rockai <me@mornfall.net>**20090720164717
Ignore-this: fe98fa6720e6d129de3e6f364fc7ba91
]
[Avoid removing in-use files on win32.
Petr Rockai <me@mornfall.net>**20090720105654
Ignore-this: 4951404baa3b6226f53629f97a1b7dc4
]
[Remove now-unused checkPristineAgainstSlurpy.
Petr Rockai <me@mornfall.net>**20090720093843
Ignore-this: b41cc7ee14e954f7d4711df66f6f5537
]
[Port the replay (check/repair) functionality to hashed-storage.
Petr Rockai <me@mornfall.net>**20090720072018
Ignore-this: a1e2c32ac633e72a8b20e830232cef5
This removes a few unsafeDiff users. It also simplifies the replay code by not
threading the Slurpy all over the place (instead placing applyAndFix in the
TreeIO monad). There is a slight risk of regressions (and a moderate risk of
space leaks).
]
[Optimize darcs show contents --match (avoid slurping pristine).
Petr Rockai <me@mornfall.net>**20090716083218
Ignore-this: c611f7eff91b80fe2bdf598b68bea454
]
[Proper implementation for mDoesFileExist/mDoesDirectoryExist in Gorsvet.
Petr Rockai <me@mornfall.net>**20090716082525
Ignore-this: 90dc8dbab055b3a78e05ff26e1605f6f
]
[Provide readPending that also provides the "pending conflicts" check natively.
Petr Rockai <me@mornfall.net>**20090716082347
Ignore-this: a7d148120c8be0844d05ba9a983bc6a7
]
[Resolve conflict.
Petr Rockai <me@mornfall.net>**20090710141253
Ignore-this: 3a7c406f2f5460925b938f7ee5d6780e
]
[Clean up unused imports in WhatsNew.
Petr Rockai <me@mornfall.net>**20090628203201
Ignore-this: 13a58bf3241a684b1484aac1859848b0
]
[Remove unused import from Gorsvet.
Petr Rockai <me@mornfall.net>**20090622113432
Ignore-this: 224d5e137d60f17031d61f7537c6ba16
]
[Invalidate the index in add_to_pending, as it was getting rebuilt too soon.
Petr Rockai <me@mornfall.net>**20090622113239
Ignore-this: 103f6b53d3bdc663b60cfa5d7e15d6af
]
[Clean up unused bits from Repository.Internal.
Petr Rockai <me@mornfall.net>**20090621143025
Ignore-this: 5686ee1be7112b52217ab50a1c37d310
]
[Move add_to_pending to Repository, use unrecordedChanges.
Petr Rockai <me@mornfall.net>**20090621142531
Ignore-this: b35e0e7848c766dfc37cf570f254c48a
]
[Move tentativelyMergePatches and friends to a new module, Repository.Merge.
Petr Rockai <me@mornfall.net>**20090621141923
Ignore-this: 6348929868d146f5877e5e6529754521
This allows tentativelyMergePatches to use unrecordedChanges from Gorsvet
without forming import cycles.
]
[Unexport get_unrecorded* from Repository, remove unused functions from Internal.
Petr Rockai <me@mornfall.net>**20090621134230
Ignore-this: 51384d4c19da07ea40cab0837effded8
]
[Use index-based diffing in "darcs wh -l".
Petr Rockai <me@mornfall.net>**20090621134141
Ignore-this: 2c8442430fdae83bcdff14f2af3db2a0
]
[Also use index-based diffing in unrecord/obliterate.
Petr Rockai <me@mornfall.net>**20090621133956
Ignore-this: 92a5a543663f0be15bb7f6f29980fa
]
[Make revert use index-based diffing.
Petr Rockai <me@mornfall.net>**20090621133923
Ignore-this: 58455b357380c3c2759d49edd119a16d
]
[Use index-based diffing in unrevert.
Petr Rockai <me@mornfall.net>**20090621133900
Ignore-this: 4624459642538a8c01a8eff93a865be6
]
[Flip AmendRecord to index-based diffing, too.
Petr Rockai <me@mornfall.net>**20090621133832
Ignore-this: 7c64b91e9a2894433c3f8b78097949b8
]
[Use index-based diffing in Remove.
Petr Rockai <me@mornfall.net>**20090621133755
Ignore-this: 39f154578a0ed352557157718f683785
]
[Flip "darcs mark-conflicts" over to index-based diffing.
Petr Rockai <me@mornfall.net>**20090621133730
Ignore-this: d92ff953fb0b6a817065a7209ee08aa3
]
[Flip "darcs changes" to index-based diffing.
Petr Rockai <me@mornfall.net>**20090620201922
Ignore-this: 56b93cec4eb2ade271687d8bb969c16c
]
[Use index-based diffing in Record.
Petr Rockai <me@mornfall.net>**20090611223612
Ignore-this: f4862b1ff2fe8e91ed088ac4f03c38b8
]
[Resolve issue1447: different online help for send/apply --cc
mf-hcafe-15c311f0c@etc-network.de**20091007162240
Ignore-this: cab61431c861e4e346f34c00f4dd26bf
]
[Resolve issue1583: on darcs get, suggest upgrading source repo to hashed.
Eric Kow <kowey@darcs.net>**20090923210811
Ignore-this: a4b801876ff76674a110f5c63388d68a
]
[added regression test for issue1632
benjamin.franksen@bessy.de**20091002095359
Ignore-this: 4a0a48021f54d7a3f8def74b1c798652
]
[Marginalia regarding TeX documentation.
Trent W. Buck <trentbuck@gmail.com>**20091003082621
Ignore-this: c204ce845db6b83b1d2ddf5dba2f1a31
]
[Avoid fugly "tests_network-.dir".
Trent W. Buck <trentbuck@gmail.com>**20091002085528
Ignore-this: aa807dad285ad2b9e7a06b5fffa0b4ca
]
[Fix plurality in a docstring.
Trent W. Buck <trentbuck@gmail.com>**20091002075501
Ignore-this: e6583c262335a0cb34a29aa1d3a01141
]
[Mention darcs changes --repo.
Trent W. Buck <trentbuck@gmail.com>**20091002075336
Ignore-this: 4342a066405b3f900b4356ab17c50534
This handy bit of functionality should be more discoverable.
I only found it mentioned in passing in one of droundy's bug reports.
]
[Partially rewrite "darcs apply" help.
Trent W. Buck <trentbuck@gmail.com>**20090920115824
Ignore-this: 92686c3bffc4beb6fad702967346b86a
]
[Partially rewrite "darcs annotate" help.
Trent W. Buck <trentbuck@gmail.com>**20090920102314
Ignore-this: b6bc982424ac641c35085f0a0c6bb97f
]
[Also test for apply posthook in issue942.
Eric Kow <kowey@darcs.net>**20090930221536
Ignore-this: b716d577e2f9423e03dc30d9954c6320
]
[Camel-case functions exported by Darcs.Patch.Choices.
Eric Kow <kowey@darcs.net>**20090921092446
Ignore-this: de5863ac95deabfe8bdcf35de07e0c6c
]
[resolve issue1620: amend lies about living logfile
Kamil Dworakowski <kamil@dworakowski.name>**20090924212910
Ignore-this: 57028d63cd6fd3bc290cf923ccc266e3
Remove "atexit remove" from world_readable_temp. Instead make sure that
callers of the world_readable_temp cleanup after themselves. Only
AmendRecord and Tag were not doing it already.
]
[camelCase clarify_errors
Kamil Dworakowski <kamil@dworakowski.name>**20090924204827
Ignore-this: b54b8fa73ddb1ceb85bfb1a024eae7f4
]
[Resolve issue 1618: preserve log on amend failure
Kamil Dworakowski <kamil@dworakowski.name>**20090924204334
Ignore-this: 69f14addad73eb63489220bb11dfb016
Print a msg to the user saying where the log was saved, in case of failure.
]
[remove trailing whitespace
Kamil Dworakowski <kamil@dworakowski.name>**20090924185145
Ignore-this: 6c1aeed210b96588f6730a174bda8048
]
[accept issue1618: amend should preserve the logfile
Kamil Dworakowski <kamil@dworakowski.name>**20090918232544
Ignore-this: 89958db98efeeff7f59c7df847052578
When Susan amends a patch with --edit-long-comment, she would not like to
lose her editorial work in case of a test failure on committing.
]
[accept issue1620: record lies about leaving the logfile
Kamil Dworakowski <kamil@dworakowski.name>**20090918231008
Ignore-this: 9ab7503f13d5480e9d767844310a544b
In case of failure, record says it left the logfile in
such and such a file. The file does not exist though.
]
[fix witnesses in Darcs.Commands.Remove
Ganesh Sittampalam <ganesh@earth.li>**20090928214205
Ignore-this: 1b8158653d00224e5972fa19458c40c8
]
[Option comments to the top in Split.hs for GHC 6.8.3
Thorkil Naur <naur@post11.tele.dk>**20090928201345]
[add newly-witnessed modules to witnesses.hs
Ganesh Sittampalam <ganesh@earth.li>**20090909200711
Ignore-this: 5f6c6ec561586c01956c3a7ff228ab3d
]
[need RankNTypes for some of the newly witnessed modules
Ganesh Sittampalam <ganesh@earth.li>**20090909200643
Ignore-this: d9bd0724f91b6a435d75ca8d93ac24fd
]
[add witnesses to Darcs.Commands.Send
Ganesh Sittampalam <ganesh@earth.li>**20090909200151
Ignore-this: ab87388a6d4469998568784aa36087d8
]
[add witnesses to Darcs.Commands.Push
Ganesh Sittampalam <ganesh@earth.li>**20090909195258
Ignore-this: c0ce49e56d76fc29fb17a9476d95bac5
]
[add witnesses to Darcs.Commands.Apply
Ganesh Sittampalam <ganesh@earth.li>**20090909194800
Ignore-this: d7975514d3aea9b53a0b9248c2a50b06
]
[add witnesses to Darcs.Commands.Pull
Ganesh Sittampalam <ganesh@earth.li>**20090909194407
Ignore-this: 51eb38f21152e1d3d348bff37aea0ddd
]
[add witnesses to Darcs.Commands.TrackDown
Ganesh Sittampalam <ganesh@earth.li>**20090909193441
Ignore-this: 8081b7aa9856ca109b9ef41a5b24725e
]
[add witnesses to Darcs.Commands.Remove
Ganesh Sittampalam <ganesh@earth.li>**20090909193405
Ignore-this: b2b55b15428a0d174338ab5ad13d8f9b
]
[add witnesses to Darcs.Commands.Diff
Ganesh Sittampalam <ganesh@earth.li>**20090909193013
Ignore-this: 5fb4fb83967232f11dde5c62c919a531
]
[improve documentation of Darcs.Patch.Split
Ganesh Sittampalam <ganesh@earth.li>**20090927211902
Ignore-this: ae40fc26efb2e8b997ccf45eb36ec832
]
[clean up types in win32/System/Posix.hs
David Roundy <droundy@darcs.net>**20090329223958
Ignore-this: 80fb3dcbc0bb296d7b7337905bcf12564f8e79f4
]
[Resolve issue291: add (basic) interactive patch splitting
Ganesh Sittampalam <ganesh@earth.li>**20090919004053
Ignore-this: 47b8c8da80f5ca5c3f86e2f11ec2192d
]
[Rolling back broken patch
Ganesh Sittampalam <ganesh@earth.li>**20090923210406
Ignore-this: 6a302cea606fa656a87140b5e2122317
It needs type witnesses to be added to Darcs.Diff, but that patch
hasn't been merged yet and probably won't be due to a conflict with
darcs-hs
rolling back:
Mon Aug 31 00:46:47 BST 2009 Ganesh Sittampalam <ganesh@earth.li>
* add some QC properties that demonstrate the problem with canonizeFL
M ./src/Darcs/Test/Patch/QuickCheck.hs -4 +61
]
[Fix breakage in manual introduced by darcs optimize --upgrade.
Eric Kow <kowey@darcs.net>**20090923210341
Ignore-this: f01f12460b26b0333da4650e6d1e485
]
[This patch is broken.
Ganesh Sittampalam <ganesh@earth.li>**20090923205150
Ignore-this: 46db0aba7910c02b3317f20fe86a2fb1
It needs type witnesses to be added to Darcs.Diff, but that patch
hasn't been merged yet and probably won't be due to a conflict with
darcs-hs
rolling back:
Mon Aug 31 00:46:47 BST 2009 Ganesh Sittampalam <ganesh@earth.li>
* add some QC properties that demonstrate the problem with canonizeFL
M ./src/Darcs/Test/Patch/QuickCheck.hs -4 +61
]
[Resolve issue1584: Provide optimize --upgrade command.
Eric Kow <kowey@darcs.net>**20090922201149
Ignore-this: e72ddff8c879de637e6a7dcb824624d6
This can be used for an inplace upgrade to the latest hashed format.
Right now it only handles old-fashioned => hashed, but there may be
future format changes for which this can be reused.
]
[Test for issue1584, the optimize --upgrade feature.
Eric Kow <kowey@darcs.net>**20090902060031
Ignore-this: 5c3032156f75f224f08fa19e5311a0d3
]
[add some QC properties that demonstrate the problem with canonizeFL
Ganesh Sittampalam <ganesh@earth.li>**20090830234647
Ignore-this: 478c798414f37433b715d87ccb4e51d2
]
[Simplify and camel-case setSimplys.
Eric Kow <kowey@darcs.net>**20090921075951
Ignore-this: 296a4bbebbb5788a8049be8ed591deec
]
[Move make_everything_later type signature next to implementation.
Eric Kow <kowey@darcs.net>**20090921090952
Ignore-this: 16f11d9fcc22370927c643fdec53ab0f
]
[Simplify EXAMPLE.sh.
Eric Kow <kowey@darcs.net>**20090825152531
Ignore-this: c6e4bbb3b241b2fb0af10ae9e519fa3e
1. Don't clean up. When you're working on just one test, it's easier
to figure out if the test is correct if you have access to the
repository. Pre-flight cleanup by all test scripts is now essential.
2. Don't rely on --repo except for init (where it saves some boilerplate)
a) Makes test scripts more natural and straightforward to write.
b) Reduces the number of variables that we are testing, ie.
ensuring that --repo path handling is working correctly at all times.
]
[Haddock some of Darcs.Patch.Choices.
Eric Kow <kowey@darcs.net>**20090919200319
Ignore-this: 1f8bb5b1bd0af5428db5229aa889518a
]
[Move some core-specific modules into Darcs.Patch in cabal file.
Eric Kow <kowey@darcs.net>**20090812145908
Ignore-this: 553684a52f09658f9772e959932b58e9
]
[Move OldDate module to Darcs.Patch.OldDate.
Eric Kow <kowey@darcs.net>**20090812145810
Ignore-this: 6caaa480c4f69809c82d681de505f59e
]
[Move RegChars module to Darcs.Patch.RegChars.
Eric Kow <kowey@darcs.net>**20090812122940
Ignore-this: a919cf75cfe1cabf39637283973b3cc
We should discourage changes to this module as it affects how token-replace
patches are interpreted.
]
[Camel-case fileExists exported by Darcs.Commands.Record.
Eric Kow <kowey@darcs.net>**20090917080506
Ignore-this: 4fb232312e43564d8eac905ae28e0c8c
]
[Camel-case getLog and getDate exported by Darcs.Commands.Record.
Eric Kow <kowey@darcs.net>**20090917080436
Ignore-this: 1d712c44fadaf6389f99de033a14e910
]
[Remove old LWN quote from homepage.
Eric Kow <kowey@darcs.net>**20090826132645
Ignore-this: 3a50f376884439e1af24729743eae4a5
]
[Rewrite "darcs show repo" help.
Trent W. Buck <trentbuck@gmail.com>**20090920071721
Ignore-this: f3d548bde2ccb324259f0e2ddb471856
]
[Remove an obsolete remark from TeX.
Trent W. Buck <trentbuck@gmail.com>**20090920063813
Ignore-this: 3d0f49f2648411fad57935c31cc83097
]
[Remove duplicated documentation.
Trent W. Buck <trentbuck@gmail.com>**20090914033822
Ignore-this: c53923d7aa40d455076571e2c7a390fb
]
[Fix "make website".
Trent W. Buck <trentbuck@gmail.com>**20090920061654
Ignore-this: fed73b55c61c0c558440d254152c5407
Updates to command_help docstrings weren't triggering a rebuild of the
user manual (which includes them).
]
[Include missing .tex files in the cabal source tarball.
Petr Rockai <me@mornfall.net>**20090920154941
Ignore-this: f0cdd39148648f463f172af7385a8d85
]
[Distribute GNUmakefile in the cabal tarball (for manual building).
Petr Rockai <me@mornfall.net>**20090920154512
Ignore-this: 3b5743d657574f25da80641ce0e437e3
]
[There's no longer a bugs/ directory, so remove from .cabal.
Petr Rockai <me@mornfall.net>**20090919143854
Ignore-this: 4ad612ab6d23c2b65ae21e873157d0a5
]
[Remove the no-longer-existing darcs.cgi bits from cabal file.
Petr Rockai <me@mornfall.net>**20090919143808
Ignore-this: 376ec57dfa6030b00b410876550a9bf4
]
[Update website to link to 2.3.1 tarball
Reinier Lamers <tux_rocker@reinier.de>**20090920185811
Ignore-this: 66fe324d61e0201c02c8b5b6db03d1a9
]
[TAG 2.3.1
Reinier Lamers <tux_rocker@reinier.de>**20090920174331
Ignore-this: a5da37b9925e1dfe3e81f0b67183ef1f
]
[Bump version number to 2.3.1
Reinier Lamers <tux_rocker@reinier.de>**20090920171029
Ignore-this: 22ca8c5b214026f65dad9af3ea01acef
]
[Update NEWS
Reinier Lamers <tux_rocker@reinier.de>**20090920171001
Ignore-this: 98380e4fbcf2d95e2fb40ffa193e9c44
]
[Typo: stray ++'s.
Trent W. Buck <trentbuck@gmail.com>**20090920094341
Ignore-this: 2190f12fbce91aa5cb0490d725f8e2b3
]
[Typo: unescaped quotes within a string.
Trent W. Buck <trentbuck@gmail.com>**20090920093803
Ignore-this: 2d830ec549956cab19432eecf83d5770
]
[Rewrite "darcs changes" help.
Trent W. Buck <trentbuck@gmail.com>**20090830035455
Ignore-this: acb923d64b290e82bb00ee7b0cc49c1e
Unlike earlier work, this aims to just make the literate documentation
visible via "darcs help". Improving the readability and coverage will
have to wait for a later patch.
]
[Resolve issue1478: document summary mnemonics.
Trent W. Buck <trentbuck@gmail.com>**20090830091043
Ignore-this: 4fa8a0519907501959546914db4bca46
Ref. Darcs.Patch.Viewing.summChunkToLine.
]
[add canonization function for FL Prim
Ganesh Sittampalam <ganesh@earth.li>**20090919004011
Ignore-this: 981d7f6a10c7800cabbe96a046a3b76e
]
[add substitution mechanism for PatchChoices
Ganesh Sittampalam <ganesh@earth.li>**20090803055723
Ignore-this: ad61b387b18796c770e70a5b4673269a
]
[camelCase recently added functions
Ganesh Sittampalam <ganesh@earth.li>**20090919105112
Ignore-this: b2eeda02acabdcaed819c19f18bbddc3
]
[Add utility code for editing text
Ganesh Sittampalam <ganesh@earth.li>**20090728174051
Ignore-this: c29b0eed3a5f88aded98a572291b3c5f
]
[break out and export run_editor utility function
Ganesh Sittampalam <ganesh@earth.li>**20090728173756
Ignore-this: 27f7117cf6e431dc7c8bf2aee6bfcd03
]
[add "parallel pairs"
Ganesh Sittampalam <ganesh@earth.li>**20090727175847]
[Resolve issue1582: bump required hashed-storage version to 0.3.8, to fix \
Windows-related file deletion errors. Salvatore Insalaco \
<kirby81@gmail.com>**20090917143147 Ignore-this: b1eeabe45cb05b1c7db54b58054dffd8
]
[change the type of gcau to reflect its behaviour
Ganesh Sittampalam <ganesh@earth.li>**20090909193221
Ignore-this: 5c6b665759572262c0bae0b4b1da20f4
Previously it returned RL (RL ...) but the outer RL was always singleton.
Changing this to RL ... simplifies a lot of client code that was just assuming
this behaviour by doing things like taking the head.
]
[make type of checkUnrelatedRepos more general
Ganesh Sittampalam <ganesh@earth.li>**20090908210652
Ignore-this: 8f2559da573ea899cef219e67dd5229a
There's no reason why two repos we are comparing for relatedness should have
the same ending context.
]
[resolve issue1300: logfile deleted on unsucessful record
Kamil Dworakowski <kamil@dworakowski.name>**20090917080320
Ignore-this: ead95914b26e0df6a79450a1d955abe3
Don't honour --delete-logfile when the record fails for any reason, a test
failure for instance.
I have changed the definition of get_log not to delete the logfile, but to
return it for deferred deletion. I capitalized on the fact that get_log
was already returning (Just temp_logfile) for deferred deletion.
get_log is an exported name, used in AmendRecord, Tag and Rollback. Some
of them ignore the logfile to delete, though none of them accept
--delete-logfile flag, and thus they don't need to change, nor are they
affected in any way.
Unintended side effect of the change: with --delete-logfile flag present, a
massage '"Logfile left in " ++ filepath' gets printed in case of the test
failure on record. This may actually be desirable so I did not bother to
change it.
]
[modify issue1300 test to fail for the right reason
Kamil Dworakowski <kamil@dworakowski.name>**20090915090307
Ignore-this: daae62898293f2871023f52d25a8eb4f
]
[Accept issue1610: bug in get_extra with darcs 1 semantics only.
Eric Kow <kowey@darcs.net>**20090916203310
Ignore-this: 472377371656bce68cb9404db284fa71
I accidentally stumbled upon this trying to write the issue1609 test.
]
[Accept issue1609: Operational Transformations TP2 on conflict marking.
Eric Kow <kowey@darcs.net>**20090916214446
Ignore-this: c1ac116a3371e8b7ed2813d4d3e78156
]
[relicense Darcs.Commands.GZCRCs as BSD3
Ganesh Sittampalam <ganesh@earth.li>**20090915200307
Ignore-this: 687099f40110c6cea2773bc96b89300d
]
[Fix a (somewhat bogus) unused-module warning in Ssh.
Petr Rockai <me@mornfall.net>**20090916115545
Ignore-this: fbc1f9268080c7d8b4bcefee0d5827c6
]
[Re-implement haskell_policy in terms of hlint.
Petr Rockai <me@mornfall.net>**20090807065736
Ignore-this: 15fbaf506ae0569d904c1ed2543abc30
This also comes with a change to the ratification mechanism, which now uses a
separate Ratified module, from which you have to import the unsafe
functions. Requires a recent hlint.
]
[test that tentative leftover is cleared
Kamil Dworakowski <kamil@dworakowski.name>**20090913221009
Ignore-this: 47ec5121156f4a0c7adc9d7f2f0e18d7
]
[extend issue1406 test
Kamil Dworakowski <kamil@dworakowski.name>**20090913213152
Ignore-this: e720fa9858a5b1e8b767ba009d4d1d9
extend with checkpoint modification checking
]
[regression test for amend-record with failed test
Kamil Dworakowski <kamil@dworakowski.name>**20090913213000
Ignore-this: de5fd196a07fb831185b8d42439b80c
This test is guarding against a defect I have almost introduced as part of
fixing issue 1406. As noticed by Petr, for old-fashioned repositories the
patches are written to files with names derived from the patch info that
does not change with commutation. If invontory is updated tentatively but
the actual patches not, than they can get out of sync and repository is
broken. This test is one example scenario.
]
[Fix locale switching in emailformat.sh test
Reinier Lamers <tux_rocker@reinier.de>**20090906172308
Ignore-this: b715f81d2f7d9e18c4ba55cafdf03c4
]
[Remove home-grown UTF-8 decoder, use utf8-string instead
Reinier Lamers <tux_rocker@reinier.de>**20090823191033
Ignore-this: 45f5d3e2d3efceba542a15b4905c7017
]
[Fix a typo László reported months ago.
Trent W. Buck <trentbuck@gmail.com>**20090913052903
Ignore-this: ad628a3885ae87357c6ead5c22604b55
]
[Improve performance of clean_hashed (by a factor of ~n/logn).
Petr Rockai <me@mornfall.net>**20090811105205
Ignore-this: 99857732fd41d031eca4df44e47d23ee
On the scale of 50k files + 50k garbage, clean_hashes was basically useless
(before: gave up waiting after 20 minutes, after: 35 seconds). (This happens
when running darcs optimize --pristine on a 50k-big repository.)
]
[Split tags/TAGS target.
Eric Kow <kowey@darcs.net>**20090911204436
Ignore-this: 84eb9b006aaed82bfd94be59b001cbee
The previous combined target does not appear to generate tag files that
vim can recognise.
]
[Test for issue1224
Thorkil Naur <naur@post11.tele.dk>**20090911170850
Attempting to "darcs convert" a repository which is already in darcs2 format
leads to a converted repository with missing file contents. This patch
provides a test that reproduces this behaviour.
]
[Accept issue1300: --delete-file should only delete if test succeeds.
Eric Kow <kowey@darcs.net>**20090907112620
Ignore-this: 5a62e769b72808c9827675b2de2e6dae
]
[Accept issue1332: darcs add -r seems to ignore --boring.
Eric Kow <kowey@darcs.net>**20090907110432
Ignore-this: e154f5d8fb9e196a87c499c94cb33309
]
[Test for issue942.
Eric Kow <kowey@darcs.net>**20090907105201
Ignore-this: 2fa9be77fc31cc4958970fc09a88027f
It appears to have been resolved by:
Thu Oct 30 18:55:08 CET 2008 David Roundy <droundy@darcs.net>
* make default be to --run-posthook and --run-prehook
]
[Test for issue142.
Eric Kow <kowey@darcs.net>**20090904173849
Ignore-this: 29fe1f32341d62b2582b601ca699e8a9
]
[Subsections for posthooks and prehooks.
Eric Kow <kowey@darcs.net>**20090902072253
Ignore-this: 85402c1fd51c99cb45e20eb0442abf53
]
[Remove darcs.cgi contrib script.
Eric Kow <kowey@darcs.net>**20090909192413
Ignore-this: 919bf120a9cf0256036598309a44b5e3
Will Glozer can no longer maintain it.
]
[More descriptive name for issue1488 test.
Eric Kow <kowey@darcs.net>**20090909192238
Ignore-this: 6bc0dddf87b12f0b269110ae5d29796d
]
[Accept issue1488: a 'fromJust error' in 'darcs whatsnew -l'
Marnix Klooster <marnix.klooster@gmail.com>**20090909180046
Ignore-this: d064a42a78efef5c327d41e425a6fefc
]
[Make the ./tests/issue1465_ortryrunning.sh a little more foolproof.
Petr Rockai <me@mornfall.net>**20090909144349
Ignore-this: 2e0f7370f2e53e3c104e68a9c5aeeafe
]
[Skip the time-stamps test on windows.
Petr Rockai <me@mornfall.net>**20090909142844
Ignore-this: 72b0bc3d549cab38bceda55113334dd
]
[make an assumption in the pull code explicit
Ganesh Sittampalam <ganesh@earth.li>**20090908214917
Ignore-this: c573c45fb13012ebd28022f44508d6c8
It seems like get_common_and_uncommon always returns a singleton list,
which is then relied on later. This patch makes that assumption explicit,
by erroring out if it's not true.
]
[Print expansions of simple commands in testsuite output.
Petr Rockai <me@mornfall.net>**20090907072337
Ignore-this: d78e78a155da6f30ebcc592780cfd699
This helps with debugging failures, since we see the exact command that was
executed, after all shell expansion has been done. Moreover, we see exactly
which command failed -- the existing -v will eg. print a whole "if" statement
with body and it cannot be discerned which branch was taken or which command
exactly has failed.
]
[Use the correct slash in push-formerly-pl.
Petr Rockai <me@mornfall.net>**20090906131345
Ignore-this: b2fe686adcdccbcaf58ca839c19634c9
This is usually not required, but in this particular case, the bad slash
confuses darcs path comparison (it keeps around the mixed slashes in one of the
paths, but has backslashes-only in the other one and wrongly concludes that the
paths are different).
]
[Exit 200 in abort_windows to indicate the skip to the harness.
Petr Rockai <me@mornfall.net>**20090906131236
Ignore-this: 18c60417b1c986eebbfddba896738ddb
]
[Add a simple testcase for the --external-merge option.
Petr Rockai <me@mornfall.net>**20090806063953
Ignore-this: e848f9b8d5d926fbcc05064d85c49316
]
[Add a rudimentary release script.
Petr Rockai <me@mornfall.net>**20090906154343
Ignore-this: 7ace3f8e435b04258b270dcd094b9f13
This should automate most of the boring and (more importantly) error-prone work
that needs to be done upon a darcs release. Work in progress.
]
[Avoid relying on /dev/stdin in tests/emailformat.sh.
Petr Rockai <me@mornfall.net>**20090903115749
Ignore-this: 43b85a6dd1fcefeb7fd32628a5311a8c
]
[More extensive haddocks on Darcs.Patch.Depends.get_extra.
Eric Kow <kowey@darcs.net>**20090905222525
Ignore-this: c8e2ac70e5f61ea12afc479636d9e0cd
]
[specify CPP globally for witnesses build
Ganesh Sittampalam <ganesh@earth.li>**20090829061922]
[missing LANGUAGE in Darcs.ProgressPatches
Ganesh Sittampalam <ganesh@earth.li>**20090829061256]
[missing LANGUAGE in Darcs.Commands.Unrevert
Ganesh Sittampalam <ganesh@earth.li>**20090829061208]
[remove some derived classes from Tag
Ganesh Sittampalam <ganesh@earth.li>**20090727060203
Ignore-this: 933bd408aff78744925ec2e6cb2475ce
This helps to make the representation more abstract
]
[couple of GADT build fixes for recent GHCs
Ganesh Sittampalam <ganesh@earth.li>**20090803050514
Ignore-this: 6c20e60426da722d0119e00be4eb6816
]
[add a comment
Ganesh Sittampalam <ganesh@earth.li>**20090803055736
Ignore-this: aad4e733fede7c8abe552893159e0fef
]
[minor clean up in TouchesFiles
Jason Dagit <dagit@codersbase.com>**20090830080712
Ignore-this: dd23aa84c47234c72f14948981214960
]
[silence a warning that happens when compiling witnesses
Jason Dagit <dagit@codersbase.com>**20090830022548
Ignore-this: 58f61bce80505de12ede5095d209b577
]
[remove unused argument to readPrim
Jason Dagit <dagit@codersbase.com>**20090830022354
Ignore-this: df9164c70fa9be8f274bdb8e634956d1
]
[use gzipFormat instead of GZip to work around deprecation warning.
Jason Dagit <dagit@codersbase.com>**20090830022209
Ignore-this: a556704bf2c974c10619a8051ebb90b4
]
[Resolve issue1578: Don't put newlines in the Haskeline prompts.
Judah Jacobson <judah.jacobson@gmail.com>**20090829072733
Ignore-this: 48a17fb0f45f3aee76aa56361bfd97df
Haskeline doesn't expect to get control characters in its prompt.
The fix is to manually print all but the last line of a prompt message
separately, and then pass the last line as the Haskeline prompt.
So far we've only seen this cause a problem when mark-conflicts is run in
the emacs shell (see the issue for more information).
]
[Whoops, one more obviated line from Darcs.Repository.Checkpoint.
Trent W. Buck <trentbuck@gmail.com>**20090829070738
Ignore-this: b9aef33a8b34db9d41f8d0b83025c85b
]
[Resolve issue1548: show contents requires at least one argument.
Trent W. Buck <trentbuck@gmail.com>**20090829073643
Ignore-this: c15286919e827a5e7fdad01c75acccfe
]
[Add a hidden alias "darcs log" for "darcs changes".
Trent W. Buck <trentbuck@gmail.com>**20090829032545
Ignore-this: 96d8bec96c5bf39387a534fa62a79e28
Reduces disparity with CVS, svn, hg, git &c, who all use "log".
]
[Mark issue68 test as failing (and fix issue number).
Eric Kow <kowey@darcs.net>**20090828101717
Ignore-this: 63c0ba22d171cefe5a0244b4ee57a991
]
[Resolve issue1373: don't use a broken example.
Trent W. Buck <trentbuck@gmail.com>**20090828062131
Ignore-this: 35d59b69c8018f55191486c6a0175c9a
]
[Reorder paragraphs and minor rewrite of darcs replace --help.
Trent W. Buck <trentbuck@gmail.com>**20090828041241
Ignore-this: 72137bca5de55b77173db6758445b4a7
]
[Remove unused code from Darcs.Repository.Checkpoint.
Trent W. Buck <trentbuck@gmail.com>**20090828030127
Ignore-this: 25ab977e5ac0b735ca6ee90aea0349c9
]
[The record-scaling test still fails.
Trent W. Buck <trentbuck@gmail.com>**20090828025648
Ignore-this: 5ca16bd011676b083cdfcd4359f4744a
]
[Print helpful message in gzcrcs command when visiting other repos
Ganesh Sittampalam <ganesh@earth.li>**20090827054315
Ignore-this: a7f997c441f0e246c4d31d827ebc9d2b
]
[Clean up leftover conflicts from merge with David's test suite work.
Eric Kow <kowey@darcs.net>**20090824104840
Ignore-this: ec4ef00d4c5b4da6e24f008f854da2e8
]
[Resolve conflicts between David and mainline test suite work.
Eric Kow <kowey@darcs.net>**20090815232335
Ignore-this: 72f386bd5345c344f32ca2db9f5594e3
Patches involved from David's end:
* add failing test demonstrating nasty conflict markings.
* mark check.sh test as passing.
* mark issue27 test as passing.
* mark issue 1043 test as passing.
* mark nfs-failure.sh as passing (even though it might not be fixed).
* mark dist-v as passing.
* mark check.sh as failing.
* clean up and mark as passing the broken-pipe.sh test.
* mark issue 525 is no longer failing.
* move bugs into tests/ directory.
The main patch involved is the 'move bugs into tests/ directory'
which conflicts with some new bugs we added. I re-added these
manually from the mainline branch of darcs along with some bugs
we added that we later marked as passing.
I also had to clean up a few tests along the way:
- check.sh because of conflicts,
- broken-pipe.sh because of temp dir garbage and
- record-scaling.sh because of MacOS X incompatiblity
]
[add failing test demonstrating nasty conflict markings.
David Roundy <droundy@darcs.net>**20090329022150
Ignore-this: 17b0df1e2a33e5efccd92f1930850c15fbf12b1e
]
[mark check.sh test as passing.
David Roundy <droundy@darcs.net>**20081207192451
Ignore-this: bb0d26124eb69bb88e981d06caa88206
]
[mark issue27 test as passing.
David Roundy <droundy@darcs.net>**20081201170526
Ignore-this: 49c7b75f79d9bf25610162d079f7dde9
]
[mark issue 1043 test as passing.
David Roundy <droundy@darcs.net>**20081119150515
Ignore-this: 8b46c9feb0680f0ee9b4f95ee93eb580
]
[mark nfs-failure.sh as passing (even though it might not be fixed).
David Roundy <droundy@darcs.net>**20081117160036
Ignore-this: d13ebd26c2a799668068132f9c4d05bc
]
[mark dist-v as passing.
David Roundy <droundy@darcs.net>**20081115221319
Ignore-this: 6fbea237af32801e7207f25af032f408
]
[mark check.sh as failing.
David Roundy <droundy@darcs.net>**20081115220504
Ignore-this: 812ad08924c9d713646c7adc26d34b75
]
[clean up and mark as passing the broken-pipe.sh test.
David Roundy <droundy@darcs.net>**20081115213750
Ignore-this: db9fb0de61a4099c73e42365047dc9d2
]
[mark issue 525 is no longer failing.
David Roundy <droundy@darcs.net>**20081115212158
Ignore-this: 8398c09d03c2e900251f46c41106d94
]
[move bugs into tests/ directory.
David Roundy <droundy@darcs.net>**20081115205509
Ignore-this: 6b249e3ba90b455331ba31fee36ef5ad
]
[Eliminate references to the autotools-based build system.
Taylor R Campbell <campbell@mumble.net>**20090826170519
Now that the autotools-based build system is gone, various vestiges
of it can be eliminated. This patch also eliminates some text in
src/darcs.tex about the Darcs cgi script in contrib/cgi/, which was
built using `make install-server' and appears to have no way to be
built now. This does not eliminate the script, however.
The following tests still refer to the old autotools- and make-based
build system:
release/darcs.spec.in
src/Darcs/Commands/Send.lhs
tests/README.test_maintainers.txt
tests/run-all-tests
I didn't change them because I don't know what to substitute for them.
The sendmail options could use some clearer documentation anyway, which
is outside the scope of this patch.
]
[update docs for darcs mv to reflect reality
Ganesh Sittampalam <ganesh@earth.li>**20090827230453
Ignore-this: 7f5c30b5711b8bbcbec47f6217662b0d
]
[Mark issue1317 test as failing (and note issue number).
Eric Kow <kowey@darcs.net>**20090824110437
Ignore-this: bbecb8d3a4e60c3bc96b28b729375b6c
]
[Regression test for issue1317.
Marco Túlio Gontijo e Silva <marcot@riseup.net>**20090811220616
Ignore-this: 846d37873b06a70bed87afeb0fbf2d38
]
[Explain a slightly obtuse one-liner.
Trent W. Buck <trentbuck@gmail.com>**20090824033200
Ignore-this: 8d6ed336b0a2d932eed879fc85183943
]
[Support tests/failing-foo.sh convention for bugs.
Eric Kow <kowey@darcs.net>**20090814103659
Ignore-this: 4729f6553910660be921af7d1199abb1
]
[Minor style tweaks in cabal test.
Eric Kow <kowey@darcs.net>**20090814102234
Ignore-this: 9ce3479022f3c177af3c4fa17426b177
]
[Support command line arguments in PAGER or DARCS_PAGER
joe@elem.com**20090823011449
Ignore-this: d979af618b5f193b58867e43dd2e0171
For example:
PAGER="less -is" darcs help
]
[Rename xml_summary to xmlSummary and summarize to plainSummary.
Eric Kow <kowey@darcs.net>**20090818220119
Ignore-this: b1e29f45f0599a406ffb6496acac2488
]
[Cut unused imports in Darcs.Patch.Viewing.
Eric Kow <kowey@darcs.net>**20090818214432
Ignore-this: f83f5ce55279a5b96a14770dbcb7dd0b
]
[Simpler types for changes --summary.
Eric Kow <kowey@darcs.net>**20090818213946
Ignore-this: 22fdc7984753eedf3d35ff88762a2eb2
]
[Camel-case some Darcs.Patch.Viewing functions.
Eric Kow <kowey@darcs.net>**20090817153751
Ignore-this: b3b03f3408f1097e5b476a35215ecec6
]
[A tiny bit more separation of concerns in changes --summary core.
Eric Kow <kowey@darcs.net>**20090817230414
Ignore-this: b9f5e9625862d19c356667dc2ce6710d
]
[Resolve issue183: Do not sort changes --summary output.
Eric Kow <kowey@darcs.net>**20090817225814
Ignore-this: 2749e08a69592f49bb7e2400ae89e8a6
This adds move patches to our high-level representation of summary output.
]
[Refactor changes --summary core code.
Eric Kow <kowey@darcs.net>**20090817225735
Ignore-this: 1078c3bf42fa5e2acef6e6a31c81c42b
This uses some custom types representing summarised changes on a higher level
and also moves the XML and 'line' based rendering of summaries into separate
blocks of code.
]
[Accept issue1472: "darcs record ./foo" shouldn't open ./bar.
Trent W. Buck <trentbuck@gmail.com>**20090815084306
Ignore-this: 23d5392008872369ba9b509b75aeb5bc
This bug was present in Darcs 2.0, but gone by 2.3.
Thus, this patch simply adds a regression test.
]
[Remove tabs from src/Exec.hs
Reinier Lamers <tux_rocker@reinier.de>**20090809163015
Ignore-this: 30952fddf0ae0f60b3af442e90411ca7
]
[Remove optimize --checkpoint cruft.
Eric Kow <kowey@darcs.net>**20090811143734
Ignore-this: c36c818704171289ff388cdd539626d5
]
[darcs.cabal turn on -fwarn-tabs per dupree
gwern0@gmail.com**20090807013047
Ignore-this: c7961b5512d2f8392f3484c81ca197e0
]
[Add script that tricks cabal into installing our build-depends only.
Petr Rockai <me@mornfall.net>**20090805152653
Ignore-this: 6a70f5ff464d26a944b81967606e7af0
]
[Avoid unescaped hyphens and backslashes in manpage.
Trent W. Buck <trentbuck@gmail.com>**20090803063335
Ignore-this: 4db2b484b68590f754d36f4751e93962
Fixes these bugs:
W: darcs: manpage-has-errors-from-man darcs.1.gz:
297: a tab character is not allowed in an escape name
I: darcs: hyphen-used-as-minus-sign darcs.1.gz (87 times)
http://lintian.debian.org/tags/manpage-has-errors-from-man.html
http://lintian.debian.org/tags/hyphen-used-as-minus-sign.html
]
[Typo: s/comand/command/.
Trent W. Buck <trentbuck@gmail.com>**20090803042007
Ignore-this: fcbe6f2cbcb3743872b0431b11dea10c
Thanks to http://lintian.debian.org/tags/spelling-error-in-binary.html.
]
[Update hpc.README to use Cabal.
Petr Rockai <me@mornfall.net>**20090730190304
Ignore-this: 7f63751a7daa418ffdca2ca6d20af1b1
]
[Add a flag for enabling HPC for the darcs library.
Petr Rockai <me@mornfall.net>**20090730185959
Ignore-this: e0246133e84e8547e223f61b67a28066
]
[Combine the HPC tix files after each test in ShellHarness.
Petr Rockai <me@mornfall.net>**20090730185951
Ignore-this: 577a6e1614aa8c5ff6f25d9df6f81554
This is done when HPCTIXDIR is set, so presumably we are generating coverage
report. We need to do this, because otherwise, a full testsuite run produces
over a gigabyte of tixfiles, even though the combined tix is less than 200K.
]
[Require haskell zlib, dropping the legacy internal zlib binding.
Petr Rockai <me@mornfall.net>**20090722091325
Ignore-this: 348c1fd005fe19900e4a9706567b4ee0
]
[Fix link to autoconf tarball.
Eric Kow <kowey@darcs.net>**20090723135420
Ignore-this: cfe87256fbd5af286a00fbb84ca443d0
]
[Update web page for 2.3.0 release.
Eric Kow <kowey@darcs.net>**20090723134705
Ignore-this: dfa04b99e5c0170448d635bf0e496a66
]
[Resolve conflict between autoconf removal and version number updates.
Eric Kow <kowey@darcs.net>**20090723133543
Ignore-this: efcf724bf0230243cee1e88502428ccd
]
[Makefile: fix dependency on no longer existing distclean target.
Eric Kow <kowey@darcs.net>**20090722093438
Ignore-this: d0f8da797e26b0c42a2da76eddd4ed31
]
[Make utf8-string mandatory.
Eric Kow <kowey@darcs.net>**20090721194433
Ignore-this: cd8a94b3e4e41bb938e82dffbcb27e2d
]
[Remove UTF8 module completely.
Eric Kow <kowey@darcs.net>**20090721194220
Ignore-this: f4ec3fe853ecbc928a8d3e3c3b9aa07c
The utf8-string package has been the default for a while.
Now we're wholly dependent on it.
]
[Add support for skipping tests (exit 200).
Petr Rockai <me@mornfall.net>**20090720095346
Ignore-this: 133cb02e8cca03a4678068450cb150a9
]
[Remove the --checkpoint option from the UI.
Petr Rockai <me@mornfall.net>**20090720093634
Ignore-this: 2fb627cd1e64bbe264fda6e19f0b085b
]
[Remove the support for writing out new checkpoints.
Petr Rockai <me@mornfall.net>**20090720091809
Ignore-this: 87eb23fe7604ed0abe5c38daafb87a7e
]
[Remove unused determine_release_state.pl.
Eric Kow <kowey@darcs.net>**20090721205227
Ignore-this: 15331bbb258fbdeb6bd4887c8dabb8ed
]
[Remove ununsed test/shell_harness.hs.
Eric Kow <kowey@darcs.net>**20090721192027
Ignore-this: 7efbe97744c698beecd4f17a09868467
]
[Remove autoconf support and cut GNUmakefile to only build manual and tags.
Petr Rockai <me@mornfall.net>**20090717160355
Ignore-this: 8a45c095c566172076adbe6e44b37827
]
[Slightly refactor the run function in ShellHarness.
Petr Rockai <me@mornfall.net>**20090714134205
Ignore-this: 92c7f05b9c4d6973e95706f23ea27dfc
]
[Slightly refactor test machinery in Setup.lhs.
Petr Rockai <me@mornfall.net>**20090714134119
Ignore-this: 32206a331658d407d9c0fb3b48405db6
]
[Use tee in pending_has_conflicts.sh for easier debugging.
Petr Rockai <me@mornfall.net>**20090713180404
Ignore-this: 7b96b7f7df6358ddb0466cfe58803f71
]
[Roll back the getSymbolicLinkStatus workaround, since it constitutes a fd leak.
Petr Rockai <me@mornfall.net>**20090710143149
Ignore-this: cd2aa7e13cc902852a7c5d0855d55538
rolling back:
Sun Jun 21 17:39:42 CEST 2009 Petr Rockai <me@mornfall.net>
* Avoid getSymbolicLinkStatus in mmap implementation, works around GHC 6.8.2 bug.
]
[Note darcs 2.3 pre-release and darcs 2.2 stable versions in website.
Eric Kow <kowey@darcs.net>**20090716133323
Ignore-this: bbe9c36213a07890816b8599f2f29aee
]
[Remove website automation from Makefile.
Eric Kow <kowey@darcs.net>**20090716133230
Ignore-this: f0cdb9afaa9d314321b345a08e2784bf
]
[Rename index.html.in to index.html, forgoing website automation.
Eric Kow <kowey@darcs.net>**20090716133023
Ignore-this: a4c62db2d3ca341e95262cd05328473f
The website automation allowed us to avoid duplication of information (ie.
version numbers), but we're in the process of changing our build and
release system, which breaks the site. For now, we go for simplicity and
robustness, perhaps restoring the automation in the future when things
have settled down somewhat.
]
[Remove bytestring flag from darcs.cabal.
Eric Kow <kowey@darcs.net>**20090714165021
Ignore-this: 4325773231f9679054c7d045657bdae0
Now that we're requiring GHC 6.8 or above, we always use the external bytestring
package.
]
[Move email unit tests to Darcs.Test module space
Reinier Lamers <tux_rocker@reinier.de>**20090629203409
Ignore-this: 3187d24822e7a125a46e0a273956d792
]
[Teach cabal about new Darcs.Test modules
Reinier Lamers <tux_rocker@reinier.de>**20090629193208
Ignore-this: c27c8398fd637e100259fdf1f4d42e0a
]
[Move unit tests to Darcs.Test module space
Reinier Lamers <tux_rocker@reinier.de>**20090629192934
Ignore-this: e88d9ecb7ca8f0b5679fba2cd2813ff0
]
[Bound size of trees generated in Darcs.Patch.QuickCheck
Reinier Lamers <tux_rocker@reinier.de>**20090628134952
Ignore-this: c499b850ad5ca15d4bada56b69ee98f3
This keeps the 'Checking that tree flattenings are consistent' test from
occasionally taking hours and hours to complete. The maximum depth of 5 was
found by experiment.
]
[Add some comments in Darcs.Patch.QuickCheck
Reinier Lamers <tux_rocker@reinier.de>**20090628134908
Ignore-this: c66a386865832e75427f99febfb91a91
]
[Avoid getSymbolicLinkStatus in mmap implementation, works around GHC 6.8.2 bug.
Petr Rockai <me@mornfall.net>**20090621153942
Ignore-this: 91092453d97c87edfc4e46b11e4ae208
]
[TAG 2.3.0
Petr Rockai <me@mornfall.net>**20090723115125
Ignore-this: e326d4ddff92c578e8fe8a3c23d00193
]
Compiled with:
HTTP-4000.0.9
array-0.3.0.0
base-4.2.0.0
bytestring-0.9.1.5
containers-0.3.0.0
directory-1.0.1.0
extensible-exceptions-0.1.1.1
filepath-1.1.0.3
hashed-storage-0.4.10
haskeline-0.6.2.2
html-1.0.1.2
mmap-0.4.1
mtl-1.1.0.2
network-2.2.1.7
old-time-1.0.0.3
parsec-2.1.0.1
process-1.0.1.2
random-1.0.0.2
regex-compat-0.92
tar-0.3.1.0
terminfo-0.3.1.1
text-0.7.0.1
unix-2.4.0.0
zlib-0.5.2.0
_______________________________________________
darcs-devel mailing list (AUTOMATIC POSTINGS ONLY PLEASE!)
darcs-devel@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic