Fri Sep 11 19:08:50 CEST 2009 Thorkil Naur <[email protected]> * Test for issue1224 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.
New patches:
[Test for issue1224 Thorkil Naur <[email protected]>**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. ] addfile ./tests/failing-issue1224_convert-darcs2-repository.sh hunk ./tests/failing-issue1224_convert-darcs2-repository.sh 1 +#!/usr/bin/env bash +## Test for issue1224 - Attempting to darcs convert a repository +## which is already in darcs-2 format leads to inconsistent result +## +## Copyright (C) 2009 Thorkil Naur +## +## Permission is hereby granted, free of charge, to any person +## obtaining a copy of this software and associated documentation +## files (the "Software"), to deal in the Software without +## restriction, including without limitation the rights to use, copy, +## modify, merge, publish, distribute, sublicense, and/or sell copies +## of the Software, and to permit persons to whom the Software is +## furnished to do so, subject to the following conditions: +## +## The above copyright notice and this permission notice shall be +## included in all copies or substantial portions of the Software. +## +## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +## EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +## MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +## NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +## BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +## ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +## CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +## SOFTWARE. + +. ../tests/lib +rm -rf temp +mkdir temp +mkdir temp/repo-2 +darcs init --repodir temp/repo-2 +echo File contents > temp/repo-2/file.txt +darcs add temp/repo-2/file.txt --repodir temp/repo-2 +darcs record --patch-name=add_file.txt --author=me --no-test -a --repodir temp/repo-2 +echo 'I understand the consequences of my action' | darcs convert temp/repo-2 temp/repo-2-converted +diff -s temp/repo-2/file.txt temp/repo-2-converted/file.txt +rm -rf temp Context: [Support command line arguments in PAGER or DARCS_PAGER [email protected]**20090823011449 Ignore-this: d979af618b5f193b58867e43dd2e0171 For example: PAGER="less -is" darcs help ] [Rename xml_summary to xmlSummary and summarize to plainSummary. Eric Kow <[email protected]>**20090818220119 Ignore-this: b1e29f45f0599a406ffb6496acac2488 ] [Cut unused imports in Darcs.Patch.Viewing. Eric Kow <[email protected]>**20090818214432 Ignore-this: f83f5ce55279a5b96a14770dbcb7dd0b ] [Simpler types for changes --summary. Eric Kow <[email protected]>**20090818213946 Ignore-this: 22fdc7984753eedf3d35ff88762a2eb2 ] [Camel-case some Darcs.Patch.Viewing functions. Eric Kow <[email protected]>**20090817153751 Ignore-this: b3b03f3408f1097e5b476a35215ecec6 ] [A tiny bit more separation of concerns in changes --summary core. Eric Kow <[email protected]>**20090817230414 Ignore-this: b9f5e9625862d19c356667dc2ce6710d ] [Resolve issue183: Do not sort changes --summary output. Eric Kow <[email protected]>**20090817225814 Ignore-this: 2749e08a69592f49bb7e2400ae89e8a6 This adds move patches to our high-level representation of summary output. ] [Refactor changes --summary core code. Eric Kow <[email protected]>**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 <[email protected]>**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 <[email protected]>**20090809163015 Ignore-this: 30952fddf0ae0f60b3af442e90411ca7 ] [Remove optimize --checkpoint cruft. Eric Kow <[email protected]>**20090811143734 Ignore-this: c36c818704171289ff388cdd539626d5 ] [darcs.cabal turn on -fwarn-tabs per dupree [email protected]**20090807013047 Ignore-this: c7961b5512d2f8392f3484c81ca197e0 ] [Add script that tricks cabal into installing our build-depends only. Petr Rockai <[email protected]>**20090805152653 Ignore-this: 6a70f5ff464d26a944b81967606e7af0 ] [Avoid unescaped hyphens and backslashes in manpage. Trent W. Buck <[email protected]>**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 <[email protected]>**20090803042007 Ignore-this: fcbe6f2cbcb3743872b0431b11dea10c Thanks to http://lintian.debian.org/tags/spelling-error-in-binary.html. ] [Update hpc.README to use Cabal. Petr Rockai <[email protected]>**20090730190304 Ignore-this: 7f63751a7daa418ffdca2ca6d20af1b1 ] [Add a flag for enabling HPC for the darcs library. Petr Rockai <[email protected]>**20090730185959 Ignore-this: e0246133e84e8547e223f61b67a28066 ] [Combine the HPC tix files after each test in ShellHarness. Petr Rockai <[email protected]>**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 <[email protected]>**20090722091325 Ignore-this: 348c1fd005fe19900e4a9706567b4ee0 ] [Fix link to autoconf tarball. Eric Kow <[email protected]>**20090723135420 Ignore-this: cfe87256fbd5af286a00fbb84ca443d0 ] [Update web page for 2.3.0 release. Eric Kow <[email protected]>**20090723134705 Ignore-this: dfa04b99e5c0170448d635bf0e496a66 ] [Resolve conflict between autoconf removal and version number updates. Eric Kow <[email protected]>**20090723133543 Ignore-this: efcf724bf0230243cee1e88502428ccd ] [Makefile: fix dependency on no longer existing distclean target. Eric Kow <[email protected]>**20090722093438 Ignore-this: d0f8da797e26b0c42a2da76eddd4ed31 ] [Make utf8-string mandatory. Eric Kow <[email protected]>**20090721194433 Ignore-this: cd8a94b3e4e41bb938e82dffbcb27e2d ] [Remove UTF8 module completely. Eric Kow <[email protected]>**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 <[email protected]>**20090720095346 Ignore-this: 133cb02e8cca03a4678068450cb150a9 ] [Remove the --checkpoint option from the UI. Petr Rockai <[email protected]>**20090720093634 Ignore-this: 2fb627cd1e64bbe264fda6e19f0b085b ] [Remove the support for writing out new checkpoints. Petr Rockai <[email protected]>**20090720091809 Ignore-this: 87eb23fe7604ed0abe5c38daafb87a7e ] [Remove unused determine_release_state.pl. Eric Kow <[email protected]>**20090721205227 Ignore-this: 15331bbb258fbdeb6bd4887c8dabb8ed ] [Remove ununsed test/shell_harness.hs. Eric Kow <[email protected]>**20090721192027 Ignore-this: 7efbe97744c698beecd4f17a09868467 ] [Remove autoconf support and cut GNUmakefile to only build manual and tags. Petr Rockai <[email protected]>**20090717160355 Ignore-this: 8a45c095c566172076adbe6e44b37827 ] [Slightly refactor the run function in ShellHarness. Petr Rockai <[email protected]>**20090714134205 Ignore-this: 92c7f05b9c4d6973e95706f23ea27dfc ] [Slightly refactor test machinery in Setup.lhs. Petr Rockai <[email protected]>**20090714134119 Ignore-this: 32206a331658d407d9c0fb3b48405db6 ] [Use tee in pending_has_conflicts.sh for easier debugging. Petr Rockai <[email protected]>**20090713180404 Ignore-this: 7b96b7f7df6358ddb0466cfe58803f71 ] [Roll back the getSymbolicLinkStatus workaround, since it constitutes a fd leak. Petr Rockai <[email protected]>**20090710143149 Ignore-this: cd2aa7e13cc902852a7c5d0855d55538 rolling back: Sun Jun 21 17:39:42 CEST 2009 Petr Rockai <[email protected]> * 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 <[email protected]>**20090716133323 Ignore-this: bbe9c36213a07890816b8599f2f29aee ] [Remove website automation from Makefile. Eric Kow <[email protected]>**20090716133230 Ignore-this: f0cdb9afaa9d314321b345a08e2784bf ] [Rename index.html.in to index.html, forgoing website automation. Eric Kow <[email protected]>**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 <[email protected]>**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 <[email protected]>**20090629203409 Ignore-this: 3187d24822e7a125a46e0a273956d792 ] [Teach cabal about new Darcs.Test modules Reinier Lamers <[email protected]>**20090629193208 Ignore-this: c27c8398fd637e100259fdf1f4d42e0a ] [Move unit tests to Darcs.Test module space Reinier Lamers <[email protected]>**20090629192934 Ignore-this: e88d9ecb7ca8f0b5679fba2cd2813ff0 ] [Bound size of trees generated in Darcs.Patch.QuickCheck Reinier Lamers <[email protected]>**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 <[email protected]>**20090628134908 Ignore-this: c66a386865832e75427f99febfb91a91 ] [Avoid getSymbolicLinkStatus in mmap implementation, works around GHC 6.8.2 bug. Petr Rockai <[email protected]>**20090621153942 Ignore-this: 91092453d97c87edfc4e46b11e4ae208 ] [TAG 2.3.0 Petr Rockai <[email protected]>**20090723115125 Ignore-this: e326d4ddff92c578e8fe8a3c23d00193 ] Patch bundle hash: 9078ee4a2ee7cbc178f0b03ce0ee3ea19bb1cbf1
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
