pristine:0000001490-d171b791841eaad442df752fe4bbde7a20ea1294726b9fa8fba0124c56eafdc1 Starting with inventory: 0000168502-720b87ea0fb8d1ef79a5392a7aa76fe0f6362d83b44bf14dd187f79c730101a0 [TAG 2.7.3 Ganesh Sittampalam **20110214234454 Ignore-this: b44142d0a73d5ead9deec24cd6fb22b1 ] hash: 0000009758-ce119e5a02382da2a13b8a5c5402dcedfc348a1f78ef04bea01e275e6a9dc31e [test for behaviour if there is pristine corruption Ganesh Sittampalam **20101123181837 Ignore-this: 7a66f8e9a87cd90cf77550ee3c1f8a2d ] hash: 0000002265-44d58a31dd8a6533ded72c5c348fde4264cff51b44b69c0ac93279d93ac0c887 [Fix inconsistency in documentation on Windows paths. Eric Kow **20101124094339 Ignore-this: eb1a4700a1bed8676067c523c7f5bad2 ] hash: 0000000654-f91b3c41a8053f5221cd8e23448dcc3b1f1b3a13a9887173fcf98e704453f20f [correct character literals Ganesh Sittampalam **20101203220936 Ignore-this: 19065e2f0ab74d7a0ef104a7f4e36449 ] hash: 0000000269-8ef9c3b4e6ff13c43873c75c34f015f7e7b10bae5e524a93747e5193335e14e8 [Haddock some of Darcs.Patch.Depends. Eric Kow **20101218114634 Ignore-this: 47ea2ce3e5b6e3d4942c70c7a28721df ] hash: 0000002918-a85f3e457449b87ef14832a502698a376dfa72c75a6b3ab108e0b8af48b62a79 [Correct comments in Patch.Depends Florent Becker **20110114144049 Ignore-this: be5e9d3fbe1ce722235d003f6d89f903 ] hash: 0000001752-e61bf47dee89ef4dab2e33faca7c56fc001fbceb6e36c9774a0fa6f75017e284 [Do not try to replayRepository in optimize --upgrade (redundant, broken). Petr Rockai **20100902162024 Ignore-this: 23708c48fb211dcd4a95ea147c1e4697 ] hash: 0000000617-02387cee2681948002a3103e9e93208680c7a9ac2bd8a78285a8a86e54f29f17 [fix redundant import since not repairing when doing optimize --upgrade Guillaume Hoffmann **20101216112324 Ignore-this: f712998161ae65f6a9bcc10d288f4aac ] hash: 0000000475-6ee077c52b58818ace435805d60356584825a7401662e0c521ff1126b0f0e085 [remove --old flag for init get and put, modify help accordingly Guillaume Hoffmann **20110121173229 Ignore-this: 51000442150d7318f302318070cb79cb ] hash: 0000018596-e0a9a636b445068311757c6d578a83089a09f427722bf27f437c4631bcdb5dad [no longer test OF repositories Guillaume Hoffmann **20110121180658 Ignore-this: 63d909879ed98b5b6f6990c8c70e86a3 ] hash: 0000000466-4ed47d42e799c1144b1317cd1eddf2d04ee98ee0e59565676a0a0891fe1290e2 [Modernize the conflict-doppleganger test. Petr Rockai **20100829171518 Ignore-this: c8a728e17efb06e73b84395a59920e21 ] hash: 0000004637-5695bad6651a356b76631a37a90cbdb9e3a3318d1b4551e3398565109e3bc6fb [Adapt issue1248 test to current OF-less situation. Petr Rockai **20100829175750 Ignore-this: a92ed0ef9be1b07bebcb6353c75ea160 ] hash: 0000009185-1aa1d7e46043deb017ec4e47e391cc161193b96313d42fd96c811e041085891b [Remove parts of the hashed_inventory that require conversion to OF. Petr Rockai **20100829175818 Ignore-this: bc8928771f8cd3a12bab69ffcf300362 ] hash: 0000000824-7440f5ea573aeb550c58a360d82d1e29d49eef3878fab35d7af1555f192932d6 [modernize issue1984 test (patch by Petr Rockai) Guillaume Hoffmann **20110122174656 Ignore-this: a19e7ae48dc3ed8afcca6c2949df42d4 ] hash: 0000000786-24d51db901717eac76a4d4c7aa507b1a2a92eb8914aa082c2d37f1a380e484f1 [remove some --hashed and --old flags from tests Guillaume Hoffmann **20110122181816 Ignore-this: dccfdcc51bc30f28627aacf85ad82671 ] hash: 0000002316-84b60f2ffe43335b8c55976a2cb70d244131335eeed07a9c5ca41347c4725ca6 [add amInHashedRepository to disable OF-deprecated commands at the UI level Guillaume Hoffmann **20110202142204 Ignore-this: feba27fd4895b6e1f10ac56848865d4f ] hash: 0000003202-59ffe0855ce3ca86dbfb392e0c68e163fcbc244f61ddcb3f7019666085ddd0dd [don't bother with testing issue1232 Guillaume Hoffmann **20110202150638 Ignore-this: d15573e9eb2653a3bbd1b16ec13270b0 fixing the test would imply adding another OF repo archive with prefs ] hash: 0000002581-a39d347db2e2a5a98f4be7969315289d0ffb17e41cb199bb92381336f37c66b8 [update v1-braced.sh test to hashed format Guillaume Hoffmann **20110202152405 Ignore-this: 8d1e7ec1aa2b14cc00a0a22f360d1de7 ] hash: 0000012610-1a25e2d98100a5a100aa84560fb9c6b9f2a6d891fb4bef89a783bed362a1dde3 [test that OF disabled commands are disabled Guillaume Hoffmann **20110202154403 Ignore-this: 1313c518dd2fa4a5fb588c89dae3d4b9 ] hash: 0000002096-a34ca5bfad4f68f555765a7938bcfef3c7295d6162cb6b09f610ab5915a45d00 [remove OF write support Guillaume Hoffmann **20110202160336 Ignore-this: 35e0c1a4c01fa06694889978c305f6bf Make low level pristine handling functions fail on OF repository by printing an error message. Adapted from work by Petr Rockai ] hash: 0000028050-b1670b7a8451d2a4b6a4e1fc0b661356f4147682dcbd301e183a242debeb2bcf [Test for issue2041 Alexey Levan**20110209221720 Ignore-this: 5e03a1c9d925e3e9642db8a1af3267 ] hash: 0000002365-96017349a33c6486056f915b1452126dfdae819382dd5e4e599e60bef62e4fe5 [Resolve issue2041: prevent Darcs from following the directory symlinks Alexey Levan**20110209221947 Ignore-this: fa39fd362b60b159d3361b86f13e9bd5 ] hash: 0000000918-b3e5539a36836ede4dcdf8a06fd83ef7e0bfc43761bdb46c0bb279cc24d1bf7a [Remove trailing space Iago Abal **20110106135704 Ignore-this: b22f530d27920a1c4fd8168083e6ec0a ] hash: 0000000256-8e5a005b4228b28f6fe81e5323562f825b777d8d5bfb0c04dec5776449dd91f5 [Clarify a commentary on commuteFiledir Iago Abal **20110106140622 Ignore-this: ae8d2f3b8e2e3926d39cf3f83a18af4 ] hash: 0000000593-aad18e032e8c88999fd93a0e6cdf282c798cd404b7fbf8cf9f06f53917fd9fcd [Add defaultToks to the export list of Darcs.Commands.Replace Iago Abal **20110206122916 Ignore-this: 594992835624de7265c0f20258279420 defaultToks will be used to create a QuickCheck generator for TokReplace patches and it is desirable to reuse this definition to avoid code duplication. ] hash: 0000000465-890882fd0d39e1f3e132b2debefdbba528ee129d50ae901309f2d08be26e8249 [Fix bug in arbitraryTree causing it to break depth(result) <= maxDepth postcondition Iago Abal **20110206123342 Ignore-this: da4e527df3bc89280355828aa6d1df2a ] hash: 0000000378-f39e635b2432fb5d5bd6d98388e0c146e14bc40db60592a05de828a146f30b11 [Fix ArbitraryStateIn s (Tree p) instance to avoid generation of a (non-senseful) initial sequence of empty trees Iago Abal **20110206132224 Ignore-this: fc74e01df9ef173c67caa24cea2e59bc ] hash: 0000000723-c9069d781f97763eabca9164a5ad3596c9d58dd19d899efdd5c3fafa4ccbf6d3 [Warn about the use of localIdentity for testing Iago Abal **20110206133139 Ignore-this: 3d4065b85bebfb67a991d236721c110e ] hash: 0000000248-9a4d2ff5b0add2f76d3e948eace7dbb928fabae84dad0846313e3d244bc7dc48 [Fix arbitraryTree frequencies to significantly reduce empty trees Iago Abal **20110206161642 Ignore-this: 473969fc9e78b5f4f52a84bf515b9e02 ] hash: 0000001724-5c5a9ce87dd082e770e1250507d5d07bbb5e28905c34e8d79b3c96d1699f789a [Add TestResult data type and related utilities Iago Abal **20110211124719 Ignore-this: 6596269ed6196dfb9a8b312c2893b0b TestResult (inspired in QuickCheck Result) considers three possible test results: a test may succeeds, fails, or (the new thing) be rejected. A rejected test case is a succeed but useless one, and expresses the desire to discard that test case and generate a new one, which is exactly what is done in case of a TestResult property being tested by QuickCheck. This data type aims to replace most uses of Maybe Doc in unit-testing code. ] hash: 0000002475-d312c47a8fa8dfd84782ad3c1a691e01849ab7607ceebc224ea0c1769b331bbc [Replace use of Maybe Doc by TestResult in unit testing code Iago Abal **20110211130556 Ignore-this: 55838705ff7ca165dfee6a21c53cc796 This patch fixes a problem in QuickCheck testing code which causes QuickCheck to test a low number of interesting test cases. - QuickCheck generators generate only about 40% of interesting cases; - test properties made no use of the ==> operator so useless cases are considered as good ones; - but those test properties should be general enough to be tested by different tools like QuickCheck and HUnit. The introduction of TestResult aims to solve all these problems, but (as expected) it causes unit tests to take longer time to run. ] hash: 0000029997-1a37ba49f1c0bae1396cef2ff4971c8335895e7b960a21785732aa4b067fbcff [Add Darcs.Test.Util.TestResult module to darcs.cabal Iago Abal **20110212004532 Ignore-this: fcae2c9cdd4d085b7f0030ea9fe65e3f This module was added by the patch Fri Feb 11 12:47:19 WET 2011 Iago Abal * Add TestResult data type and related utilities but I forgot to add it to the cabal file. ] hash: 0000000421-674d6e26da2473f9f1f1dafa337a0ec533fdc2e15bbb658daba732e46f22f8a0 [Move commonly used functions from (Darcs.Command.)WhatsNew to Util Alexey Levan **20110209012618 Ignore-this: effff092d989864eb8346019ce98fbd3 ] hash: 0000005767-db158424822dcf55b5f78e5b08ec92834f437838a7be97594e5ff38bdd6a28bb [Maybefy lists in patch selection code Alexey Levan **20110209013427 Ignore-this: 92e6f756277f856bd7a87ce7cea6c774 ] hash: 0000006990-a544cd2c7484c842b3e608e9393de10f2ced3af31891f5a8ee7bc731368d664c [Add Darcs.Commands.Util to darcs.cabal Alexey Levan **20110212004337 Ignore-this: fad529599e00972dfaf85293b8df1f40 ] hash: 0000000203-00f88c779136f6e64cf3f579ba23f25e760737525614372493b612a46174d915 [Darcs.Patch.Prim.V1: missing newline at EOF Ganesh Sittampalam **20110202071641 Ignore-this: aab06507ef5e949d460626cf4a4c8c3b ] hash: 0000000185-158d2c46b62d39a594f1a2adf9046fccf6c0e087576e50ba170d66847ffc548a [Darcs.Repository.LowLevel: missing newline at end of file Ganesh Sittampalam **20110202071707 Ignore-this: e27a5e13cc3037dbce09048e9e6d20bb ] hash: 0000000206-dbe20f6a89ac0cd46a2c7e6819be7ffca28af487e0c5049eb55183e2815b6cb7 [Darcs.Witnesses.Eq: missing newline at end of file Ganesh Sittampalam **20110202071720 Ignore-this: 636fd48c2e7e3b44fe696aeae92efafc ] hash: 0000000191-4e0491b15e7b919a5d35662823f7e44a21e7ec0321fda6d5a6f0b948c657b0cb [Darcs.Witnesses.Ordered: missing newline at end of file Ganesh Sittampalam **20110202071738 Ignore-this: d3abbe6c909cbd9226179629307e7c76 ] hash: 0000000202-662c8244a9f045061fb298b3d440a0a6748896d4e96c3d3b7deaac7adfd18a69 [Darcs.Patch.Dummy: missing newline at end of file Ganesh Sittampalam **20110202180834 Ignore-this: f0eb4d12bb885bc69746d62d2df7344d ] hash: 0000000189-153542f9bb7d53b0cc6adb7d63d1defc49843d54660864e71fbb4a7cc560efd9 [Darcs.Patch.Bracketed.Instances: missing newline at end of file Ganesh Sittampalam **20110202180847 Ignore-this: a762848e0f0012437f5190510cee94eb ] hash: 0000000217-d5291e66c7553b924eabcb60253fd4e83a6d12f16b831ba5c035193133482e3f [Darcs.Patch.Bracketed: missing newline at end of file Ganesh Sittampalam **20110202180900 Ignore-this: 5d6dcdf17abf881b261f837104909311 ] hash: 0000000197-525b4fbc3c0cea7df95587f44e67f51a54b9f227e9d9440338285774252a9de3 [Darcs.URL: missing newline at end of file Ganesh Sittampalam **20110202180916 Ignore-this: ca5a3c1aaec9c10911038f7171737f84 ] hash: 0000000174-069607c5c687439361e832011e43a1ffa2bcfc782de5b10d105ce5033f90f63c [Darcs.Witnesses.Sealed: add trailing newline to silence compiler warning Ganesh Sittampalam **20110207202715 Ignore-this: 570e9c64c89f3723a2276a7620154cef (the warning only appears on Windows for some reason) ] hash: 0000000273-c5ce9f109697d56963a553c682d48507fc08b43d61bda33dc651d818a88a30bf [tar on mingw seems to think c: introduces an ssh path Ganesh Sittampalam **20110214220707 Ignore-this: 36805cc6976866cfd96d5099a52cfa14 ] hash: 0000001115-e16bac4d26b36ee72eb3eb8c0d28f5f096ae605b14ee8b622c2f4ca9949c6c27 [inline manual part of darcs.tex up to arguments Guillaume Hoffmann **20110208190410 Ignore-this: 27aed3416c18cfe230985dd6bab43178 ] hash: 0000065579-0fe2c618e0c11527466e983f9c13bb1e70e65cf6b1208cce1600e511ffd5b4a1 [no longer build patch-theory manual file Guillaume Hoffmann **20110209171620 Ignore-this: 1913f56819731b71a325faed652a7c37 ] hash: 0000007732-0311885d7b952586c74fe617bb59b5642974c953cc6c5a53afa11c552b85957f [inline manual parts of configuring_darcs.tex Guillaume Hoffmann **20110214214803 Ignore-this: 39d939f9e4afb4fd019666e153d3c194 ] hash: 0000019797-7e6c3e0f0f31e2941d47c1544f6c955fb11ebd1093cced45d2f133f799a701b0 [move some literate haskell into theory_of_patches.tex Guillaume Hoffmann **20110214215211 Ignore-this: 35604788433116f83ee68ef7f03b7fc2 ] hash: 0000068735-6ba264c015ed8ce6b8e46fa7119a7ebc16811b5b0a43a61c5310168cc1fc2784 [get rid of literate haskell for GZCRCs and TransferMode Guillaume Hoffmann **20110215004046 Ignore-this: 8455044a1c7afc282c4a719fd4a556c4 ] hash: 0000004538-a74004b030b88726360f27b75f2b244515ca1184f82dcd7020a95e96329d0f46 [get rid of literate haskell for commands Guillaume Hoffmann **20110215004458 Ignore-this: 82906f94777a3b17c2267fd7dce4297e ] hash: 0000133396-31daad9e46889bc95f48ec1ca858f40171e92a5fe3b43dde2a6d1fc602352f42 [remove irrelevant microbench.hs Guillaume Hoffmann **20110215110416 Ignore-this: dbf0209b65f1f799ac666363e6f5e340 ] hash: 0000001726-f22e7d846adbd1aca7fd42a5adb7283904fcd852e248f6c1896111d52ca4150c [move manual .tex files from src to doc/src Guillaume Hoffmann **20110215111758 Ignore-this: ebdc2b76a3728bcd5d70a08c2df6739e ] hash: 0000001332-68fcff8c283b69c8901052e256b9fe6418bdb564489320fd75769db5f4264270 [remove unused stringify.hs Guillaume Hoffmann **20110215113824 Ignore-this: 949a572c758f2996927033143642177f ] hash: 0000000756-eaae5db94929256cdb7e5f5733bd0879371320a3e8c6274ca804d4a158cea268 [remove bench dir since benchmarks have been externalised Guillaume Hoffmann **20110215223729 Ignore-this: 7c63f356e903b4bc90c874ca0f87b97c ] hash: 0000001413-b32491dc8aed06ab37422f573c9a4d5a6838b848b20419acdf1930bff1e31ec8 [Add -fhpc to darcs-test Iago Abal **20110216163907 Ignore-this: d7c6b028514a2d4b0526c35f45840e85 -fhpc should be passed to GHC when hpc flag is provided to cabal in order to obtain coverage information for unit tests. ] hash: 0000000318-f68e6e03305cd0920126143bb2b6ba1e556c5fd96d1efce5640bdbf58ad9bc0c [(Dirty) Fix of hpc.README for automatic generation of coverage report Iago Abal **20110218193755 Ignore-this: 5194eeb267fc91dc459bae63d364cda - A report is generated for both shell (network included) and unit tests. - The use of hpc-sum could be replaced by the use of HPCTIXFILE. ] hash: 0000003054-57cc9a2e30840b26805743d26babe0c45c693623c10e3ed585743726e491688e [Fix darcs-test on Win32 + GHC 6.12+. Petr Rockai **20101121174348 Ignore-this: b73beefe16f66da50bcef5491c11ed6b ] hash: 0000000428-7a9b4717324ad6951542556e91b40a58ce19f4aec98d7f02e148b9d7a092849e [Fix backslash escaping in my APPDATA patch. Eric Kow **20101130150343 Ignore-this: 2664c25f33756a19b5ed8855de371e89 ] hash: 0000000426-c760381c78a8514207cda0aa411a9b119cb8e1a1f1d44cb53038d4fd4df9bf05 [Remove useless MonadError contraint in Readable/WriteableRepository TreeMonad instances Iago Abal **20110215135357 Ignore-this: 4b5c23adcd33efa39f60b15a9f5fdbad That constraint comes from previous versions of hashed-storage and was inherited by Darcs. Solved in hashed-storage 0.5.5 this contraint can also be removed from Darcs, requiring hashed-storage >=0.5.5. ] hash: 0000000934-dd0d70f479653b801200f4216a9e8d44ab0cd13ba3301d607473248898cf03f0 ["Fix" the increase in test execution time Iago Abal **20110215160615 Ignore-this: 65d7ef7f389020d5dd8984d0277c70f6 Just set a limit for the number of discarded tests, causing execution of fewer tests for those properties with requirements that are hard to fulfil. ] hash: 0000000668-eaee0c648cd953dc4a6add16618bd98cb6e4827e7cda4f29acfe2e5f16c2b25a [Add Darcs.Test.Util.QuickCheck containing some auxiliary QuickCheck generators and combinators Iago Abal **20110215163945 Ignore-this: f3e686d7c4eed39ec15f4ba55200bc62 ] hash: 0000001336-f209f685626943a3f4622ce2e9200254b76f008676aa1a962c6da93b8a2e5671 [Remove unused import Iago Abal **20110215183057 Ignore-this: 1a39476af06b0df0c892841296aa3e1a The referred Eq Patch instance (see patch details) is not longer defined in Darcs.Test.Patch.Test so the import became useless. ] hash: 0000000346-77faf1b430da1d2ffc359897308a0745a2ddffd0a6453a2c88ba00c486e095cd [Clarify comment Iago Abal **20110216171334 Ignore-this: e3ad1e09d4c690a51cdc3093c336016d ] hash: 0000000274-724977d4523a40f7527a718949913ee6cffbaf259c72518fd8d1df96124742d5 [Add Darcs.Test.Patch.RepoModel Iago Abal **20110216181455 Ignore-this: cdffe8d40098b0b5acdf2ae7ec9cfc1d Repository model for testing purposes, allowing things like in-memory patch application. ] hash: 0000008596-ac3844d84c23fd7866b84fbc13baee1a98dff64f144f8554352918746225039e [Improved generators for V1 Prim patches Iago Abal **20110216191016 Ignore-this: 16f6c03a86923c74fe6e3e40d9c34bce NB: Module Darcs.Test.Patch.WithState introduces some code duplication that will be removed later by some refactoring patches. ] hash: 0000010552-0ace28765ec292c6afdd8e8b84ee1541c7bdd716023d0387fa69ba9aa7083dac [Add testing properties for V1 Prim patches Iago Abal **20110216194538 Ignore-this: 6d393f77673a166e53a8a50cc97af30b - Darcs.Test.Patch.Prim.V1 indirectly depends on tar package, so tar had to be added to darcs-test dependencies. - There is an small mess in Darcs.Test.Patch.Properties caused by two RepoModel definitions, but this will be refactored later. ] hash: 0000005100-24ea3339b4c696dc0da0e548e72978adb106802a1e19a1aec5c7b4ed37aecd6f [Add invert-rollback and effect-preserving properties Iago Abal **20110220005303 Ignore-this: 2b3e8d694b8ea0a97505c9ec7440dc0c ] hash: 0000001830-c2f47d04704dd8b2adaaf715d9a3a39a9b85831d1072aa8594a4510d99ad2b77 [test harness: recommend .exe suffix on Windows Ganesh Sittampalam **20110218070834 Ignore-this: c6f3c9335672abe0674bcd2961ac568b ] hash: 0000000860-5ad39a4d646f8272259f1c46b99bb58c5e10a5f3cbf798b444f290bc59aed8e6 [add Witnesses.Functor Ganesh Sittampalam **20101123075047 Ignore-this: 5e50fc7ff95c57d4546ad4bbc2618fc8 ] hash: 0000000502-a2d871ea6a119096ea078e37a0e462f7c422646cb910f28c86860d352858e284 [add Prim.WithName Ganesh Sittampalam **20101123075048 Ignore-this: 395701d2e54b09fddccfa0746ca1a305 ] hash: 0000005331-89fd2e49f10411ed9732a15d9a61e4190f943c9110bfefa950ffaefbf4d7c0ca [TEMP: confict labelling Ganesh Sittampalam **20101123183344 Ignore-this: 70cf4062cc2b36ed0c66a3808c3b1791 ] hash: 0000009570-86644a443ea5df72b0bd5d04c703d01d37c795b741c46c2ede21aa27beb08d38 [simplify a couple of instances Ganesh Sittampalam **20101203073556 Ignore-this: 70ccc59dc8a960ecf2a410aac3f7868e ] hash: 0000000701-cafc662723589daf71a27b3a49c295629df2bb0cfdb82df0a68166b1eed101b3 [report files in conflict in darcs markconflicts Ganesh Sittampalam **20101207071950 Ignore-this: 3615174e651f85f3d9467ceb35a9e9bc ] hash: 0000000703-723e3b40a2695debe1c9cb06dd8ae5a3a881868ec6c04d66ae9b47fca243671d [ignore duplicate patch info (each hunk comes with its own) Ganesh Sittampalam **20101209064841 Ignore-this: 935f3ae08f6192d8d6461458b42d7fcf ] hash: 0000000429-3bc437dfd40f3c885850b6c47876cf0584ebdac01b7230ee37d7e5acab6be63f [use human-friendly patch info Ganesh Sittampalam **20101209064927 Ignore-this: fb7a3c02d21d230a689e91bc6724c597 ] hash: 0000000678-1a92d083917e314fbf36382db6f99aed60ecb1aaa9f5926cbce0bf330a12d455 [loosen some constraints Ganesh Sittampalam **20101209064947 Ignore-this: 9a5e621c0037f5020955fdaaa7f1491b ] hash: 0000001349-e3f29ec893e3762984983a5eb68678d1af7db2654e99fcbc61a1888d0071ce99 [hack in labelling on pull Ganesh Sittampalam **20101209065418 Ignore-this: 6a5ff266d9abed1f54c077f18075f538 ] hash: 0000012595-36db6b5a2ca01fb3c5733d7164f991f1eeb926a269fd5c5e835887aef7c7fc98 [issue1988 cleanup: accept throwing away repo in final step Ganesh Sittampalam **20101209181424 Ignore-this: 55dce078bf93ed445ed8d36686ab2faa ] hash: 0000000437-ef4e0b9fedfc9f1103d7e91f558a9acc95b7aaba25ef5d402278d35beb3575eb [use new conflict marking Ganesh Sittampalam **20100908061541 Ignore-this: f8fbd49518246affa2de69ce2c459b ] hash: 0000001632-dbf7687e45e38e38f7069aa0466ce85fd4136a1cc5fd6a67c9aa1694e364d9c5 [move Tree out into separate module Ganesh Sittampalam **20100908061244 Ignore-this: 63a8f04ea1ad788723c24f5b6a2c6eee I have marked it as copyright by me (and BSD'd it) because I originally wrote the type when developing the QuickCheck tests in 2007. ] hash: 0000004153-ef5d56217e09f1317837816f1e38e391822e78b360205d45d46a610fbfbf741d [tree enumeration and flattening Ganesh Sittampalam **20100908061414 Ignore-this: 2beb525a1844cdc23c3589cac8bec1df ] hash: 0000006040-e2a6a63b1be76b411142f27324c15bad439034e82c1e6ce3e47033871de899f8 [always merge equal patches exhaustively in tree flattening Ganesh Sittampalam **20100908061525 Ignore-this: c22811391f2f6badb59e2ea6837873dc ] hash: 0000000417-ba9495ad1519ecdf325c5026571ca41b68341155967cfd0929c6413e76ad54fe [show instances for RTree Ganesh Sittampalam **20100908061508 Ignore-this: f2093cdfd7994c57984b7fc2d3b218f9 ] hash: 0000000537-350c69e26d7e880e93a915c08f2ea6c16a32ce216b1462118d831c00286ace23 [Tree equality Ganesh Sittampalam **20100908061447 Ignore-this: 4d32e5cee1adac77941e0cd54314caa5 ] hash: 0000000680-a9c129b1cc54d9d2bcefb64550dca6f2b2042536420a5684a44589d16400f7fe [add Show1C class for abstracting over containers like [] Ganesh Sittampalam **20100908060559 Ignore-this: ae18c17125cafece49a677f5a0874400 ] hash: 0000001239-b8322ea93d213f1fda44daf828b4951aad2e318e5dffe4607c00d94b6f802fca [Resolve conflicts between Ganesh Sittampalam **20101216182115 Ignore-this: 37162e8ca5dccbe0f0690c3208bbb187 Wed Sep 8 07:15:41 BST 2010 Ganesh Sittampalam * use new conflict marking and Tue Nov 23 07:42:43 GMT 2010 Ganesh Sittampalam * abstract Prim behind a class Tue Nov 23 07:50:27 GMT 2010 Ganesh Sittampalam * abstract RealPatch over Prim ] hash: 0000000971-8bcd316c48c3b4f381cf06c1bceebe1daa74c312e2bc0f1dc4ff214119afc105 [fix warning Ganesh Sittampalam **20101217065838 Ignore-this: a9f29ab24422c61b9579c02f967eb04c ] hash: 0000000189-03edaa8e526d3c3e0f076bee1d1cf193c6222a2f1eb27a5d8c8e6e9f5ca4c383 [loosen some types Ganesh Sittampalam **20101217070136 Ignore-this: bddfca0553ce47a773c3829502c61920 ] hash: 0000001385-109b3181bb9a9503f61c9a4be17cb11eb23e5be458e0722d98c38e1e95a89c57 [fix warnings Ganesh Sittampalam **20101217070208 Ignore-this: b14f201c364244841743ffdce0a4282f ] hash: 0000000556-ed068a2aec3f0016952b90b6daf0d908c03d0a413a60e1fda61d21f92cb19ff6 [resolve (semantic) conflict Ganesh Sittampalam **20101217070555 Ignore-this: 4209a6cdae390c7e770dfda601ea1ad7 between the inclusion of flattenRTree and the removal of MyEq from Invert ] hash: 0000000423-62cf11f78671915f6532c06aaf5c781e00cbe4991129da338b6edc8b116d2030 [add namedResolve Ganesh Sittampalam **20101217071012 Ignore-this: d213454ae5368968d9b44c00d8fb1948 ] hash: 0000001791-918c9514a8c79439b9656afae68ba3b52d81c7ae3ae1ff777504af33dc747c0a [print out conflicting patch sets in markconflicts Ganesh Sittampalam **20101217071157 Ignore-this: 2f23a3649838e5cd81c0a616f5e9249b ] hash: 0000002894-759fa6c4c0dc9e116eca3330d5666f578111c7ed4ee9242ad3c6823750053295 [fix warnings Ganesh Sittampalam **20101217072634 Ignore-this: 6eb074b4bffa64efb92e544bf798a040 ] hash: 0000007767-0947563f8e1501657ee901982b5f13aa88a6e7767f69525f1757cc5b3d4662c8 [add cabal flag to build with warnings as errors Ganesh Sittampalam **20101217072715 Ignore-this: 4c926d1278e6e670c121d7fc6d19e5ca ] hash: 0000000591-c08d872ea1d3e4195e9a667c11533cebee4ffcea95adec95b8cc7530eec5fa3e [improve pushConflicts: Ganesh Sittampalam **20101217080645 Ignore-this: 65490202e878eeaf3dd24919bff92e89 - start from the other end of the list so patches we push past are already annotated - when coming back, merge with the already annotated patch instead of commuting with the unannotated one ] hash: 0000003162-b1f5a3d13914b50864d216fffa53fd875d368c0c40acf2568d36c442b0c2f88d [add LabelConflicts to cabal file Ganesh Sittampalam **20101221070441 Ignore-this: 3214dd3d030fc0b81ba2a46f7163c11a ] hash: 0000000208-c2c6478ebe1a709f00b915a7f6e83775593de7c879c7c19dde4e6fe7d1d95fee [don't coalesce when working with V1 patches Ganesh Sittampalam **20101221181338 Ignore-this: 646410e7153e8e5b2affa06f2957816b This seems unnecessary/wrong and it messes up attributing prims to the megapatch they came from. ] hash: 0000000736-65235a31d9e9df9d7cd4adb8708b6842138a36b7ecc4b05f5ef49c0f79f5af1e [drop out of date Tested-with from cabal file Ganesh Sittampalam **20110105081932 Ignore-this: 4f168d0ba964e371d998e9ddf2fe1f84 ] hash: 0000000197-2b747ef895c42f73fdc82d9f8058342f67d706c3a550c5905c0e03704c8ee6e9 [Resolve conflicts between Ganesh Sittampalam **20110221065913 Ignore-this: b3a6efef16f9f6679b04dfecba39b442 [Tue Feb 8 19:04:10 GMT Standard Time 2011 Guillaume Hoffmann * inline manual part of darcs.tex up to arguments] and [Thu Dec 9 06:54:18 GMT Standard Time 2010 Ganesh Sittampalam * hack in labelling on pull] ] hash: 0000004404-373cd06f3f7a522c0f14647b78bf838b89884e5d6545a63ff2b83ee23713d08c [Resolve conflicts between Ganesh Sittampalam **20110221070032 Ignore-this: 23eda95c2c4befdf39d1a915dea4fbe9 [Mon Feb 14 21:52:11 GMT Standard Time 2011 Guillaume Hoffmann * move some literate haskell into theory_of_patches.tex] and [Thu Dec 9 06:54:18 GMT Standard Time 2010 Ganesh Sittampalam * hack in labelling on pull] [Fri Dec 17 07:26:34 GMT Standard Time 2010 Ganesh Sittampalam * fix warnings] ] hash: 0000001556-0867eb0c9f60bc010898f989bae70ecdf6c0255291735f59d642a75b7e563bad [Resolve conflicts between Ganesh Sittampalam **20110221071235 Ignore-this: 332dff2ec8118120873ebc75435fd323 [Thu Dec 9 06:54:18 GMT Standard Time 2010 Ganesh Sittampalam * hack in labelling on pull] and [Wed Jan 26 23:22:25 GMT Standard Time 2011 Alexey Levan * Don't treat empty lists as special; use Maybe instead] ] hash: 0000000617-e0edf2ff6f124103ad4283220f8f0b9197b742fecad456eb4ed709288ab05f53 [GHC 7 build fix Ganesh Sittampalam **20110221071240 Ignore-this: 27cff8612c3a23a7abb85eb36a30d078 ] hash: 0000000232-38d4d861b8d7b5985afaecf5569961dd8ce1b893986dd39a3f6a3e6d8b688241 [TEMP: newlines at ends of files Ganesh Sittampalam **20110222181714 Ignore-this: cdf37935deceacb7f28da4573bdbb8a9 ] hash: 0000000268-188d1377c762e905033a9cd99796d87d7dad6f8e29efb9427a680077271f9092