Checking the unravelling of a merge of a sequence... unit: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
[KNQ7
kXQlnebPF5**Saf04zeR
 gHS2
 .OT09ziOj
 d
 H
] 
<
[N
mitNwm**QptV~FBkC
 900p-FUu
 ytiIFN
 XG

 TVCPqqts
] 
[ueR2q5d~
9m~uQ3ad2W**8,OScHT~
 Ex1K7k9u
 2l
 P2Wg2nbE/
] 
[Fu
J4f**d3/Zd1F
 39D

] 
[GEawX
l-B**yog2Z/z
 5CDJKii
 D2CH
 t2Agb
 qZCLDyA7
 Ty
] 
[Ii2kX2c
vvcJTtP,b**w1SIK~j5v

 7
 Ig.Up88j
 K8an8
 w.
 AEXuHu
 ySnEY~w
] 
[JF3uI5tH
fzBfny**Dx5tbp94
 9oCATx
 Syso2h,Q
 3RKwjAQSW
 gFSg5K
 zN/zJ
 HxUHbyvZg
 2Q5
 fo7xTTtY~5
] 
[5F,
VuCOsiYk6**FPkZo
 NI
 ,076qfjlC

 UhgOdHnZE
 cHGb
 .v0
 ZsyPS
] 
[,rhvp
iO3sR**l5gJ-EYGU
 Tv~IN
 pv4K
 1ZDDy
 osZ9rYh/Tw
 WVoona/
 kkh
] 
[bC
i5**.16t
 K
] 
[HB.0A-Er
m**wK
 Ouob
] 
> rmfile ./test
[o2BVe
o3z65-ydf**gt
 jL6~kVDTf5
 ap4
 jnaU8N5gD
 h.a
] {
hunk ./jii 1
-a world silly
+this test a
+~2Vt~,9
+{
hunk ./hello 2
-
-silly a test
-}
-}
-is token silly
-a test hello
+a a is
+}
+}
+silly hello test
+token is hello
replace ./HHqFvM [A-Za-z_] hello is
changepref movie
silly
a
addfile ./I
replace ./world [A-Za-z_] silly token
rmfile ./world
}
)
merger 0.0 (
merger 0.0 (
rmdir ./test
move ./test ./world
)
adddir ./test
)
)
Please report this to bugs@darcs.net
If possible include the output of 'darcs --exact-version'.
make: *** [test_unit] Error 1

====================================================================
darcs --exact-version
====================================================================

darcs compiled on Feb 11 2007, at 11:01:59
# configured Sun Jan  7 22:08:03 CET 2007
./configure --no-create --no-recursion

Context:

[Resolve conflict between complement add and get_recorded_unsorted.
Kevin Quick <quick@sparq.org>**20070206071832] 

[Added --complement to pull to allow "exclusion" repos
Kevin Quick <quick@sparq.org>**20070204181301] 

[Correct test for quoted arguments in DARCS_EDITOR.
Eric Kow <eric.kow@loria.fr>**20070204211312

 1) On MacOS X, grep lives in /usr/bin, not /bin
 2) We shouldn't escape the double quotes because they're already protected
    by the single quotes

] 

[Restore working directory if no repository is found (issue385).
Zachary P. Landau <kapheine@divineinvasion.net>**20070203173440
 seekRepo continues to go further up the directory tree looking for a
 repository.  If we are not in a repository, our current working directory
 becomes /.  This causes problems with code that falls back on creating
 temporary files in the current directory.  This patch will restore the
 directory the user started in if seekRepo fails.
] 

[refactor get_unrecorded.
David Roundy <droundy@darcs.net>**20070128231405
 I've removed the [DarcsFlag] argument, and added two new functions
 get_unrecorded_unsorted, and get_unrecorded_no_look_for_adds, which do what
 they say.  I think this simplifies its use, and cleans things up a tad.  It
 doesn't scale to many different ways to get_unrecorded, but I don't think
 we want to go there.
] 

[use (empty) opts to Repository in list_authors and make_changelog
Tommy Pettersson <ptp@lysator.liu.se>**20070128165840
 They where left out in the opts Repository refactoring.
] 

[fix bug triggered in replace.sh
David Roundy <droundy@darcs.net>**20070128002206
 This bug was an annoying one that seemed to involve trouble caused by
 unsafeInterleaveIO and the order of evaluation, since we change the working
 directory.  I've simplified the code significantly.  Complicating the debug
 process was a race condition caused by the lack of --ignore-times in
 replace.sh, which was because darcs replace didn't accept that option.
] 

[refactor: add opts into Repository.
David Roundy <droundy@darcs.net>**20070128000728] 

[add test for replace that messes with unrecorded hunks
Tommy Pettersson <ptp@lysator.liu.se>**20070125153803] 

[go back to using system for edit_file/view_file instead of exec (system 'cmd "$ARG"')
Benedikt Schmidt <beschmi@cloaked.de>**20070131162811] 

[use TODO instead of pass for record_editor test
Benedikt Schmidt <beschmi@cloaked.de>**20070131161635] 

[add some tests for edit_file and DARCS_EDITOR handling
Benedikt Schmidt <beschmi@cloaked.de>**20070131011526] 

[fix bugs in replace.sh script--running wrong darcs.
David Roundy <droundy@darcs.net>**20070128001826] 

[Remove extraneous parentheses (RepoFormat).
Eric Kow <eric.kow@loria.fr>**20070127231359] 

[make write_repo_format agree with read_repo_format (use | for separating properties)
Benedikt Schmidt <beschmi@cloaked.de>**20070126143752] 

[add documentation for DARCS_PAGER
Benedikt Schmidt <beschmi@cloaked.de>**20070126142649] 

[Fix issue383 - allow --disable-ssh-cm for 'darcs changes'.
Georg Neis <gn@oglaroon.de>**20070121224417] 

[(add a + mv a b = add b) and (mv a b + remove b = remove a)
malebria@riseup.net**20070108160933] 

[update web page for new mailing list server.
David Roundy <droundy@darcs.net>**20070116162930] 

[Canonize Marco T√∫lio Gontijo e Silva.
Eric Kow <eric.kow@loria.fr>**20070113231736

 Sorry for stripping off the accent.

] 

[Redundant noncomments
malebria@riseup.net**20070109125519

 noncomments was already called by get_preffile via get_lines.
] 

[Remove unused functions from Population.
Eric Kow <eric.kow@gmail.com>**20070107232034

 The functions are not shown to be used by any other part of darcs.
 Perhaps they should be restored if we ever get to work seriously on
 libdarcs.

] 

[Import IO.bracket instead of Control.Exception.bracket in Exec.
Eric Kow <eric.kow@loria.fr>**20070107211935

 This makes darcs work on *nix the same way it did before Simon Marlow's
 runProcess patch for Windows and my conflict-resolution tweaks.

] 

[Import bracketOnError from Workaound instead of Control.Exception.
Eric Kow <eric.kow@gmail.com>**20061225212444

 bracketOnError was introduced in GHC 6.6, whereas we want to support 6.4.1 and
 higher.

] 

[Fix conflicts and compile errors (Exec runProcess stuff).
Eric Kow <eric.kow@gmail.com>**20061225212423

 Side A:
   Simon Marlow: Use System.Process on Windows

 Side B:
   Edwin Thomson : Make Exec.lhs not import unneeded Control.Exception functions
     when compiling on Windows.
   Magnus Jonsson : Added rigorous error checking in exec

 Compile errors in question were just import-related issues.

] 

[Add Workaround.bracketOnError (introduced in GHC 6.6).
Eric Kow <eric.kow@gmail.com>**20061225201830

 This is to compensate for the missing Control.Exception.bracketOnError
 in GHC 6.4.2

] 

[Use System.Process on Windows
Simon Marlow <simonmar@microsoft.com>**20061129160710

 This was an attempt to address "[issue218] Patch bundle failed hash",
 but unfortunately it doesn't fix the problem.  Still, System.Process
 is a better way to invoke external commands these days.

 For now, the new code only replaces the Windows version of exec.  This
 means that GHC 6.4 will be required to build darcs on Windows.  Better
 would be to add a configure test, but I ran out of time here.
] 

[fix [issue370], darcs ignored args contained in VISUAL variable
Benedikt Schmidt <beschmi@cloaked.de>**20061220110807
 given VISUAL="emacs -nw", darcs would run "emacs file" instead of
 "emacs -nw file"
] 

[Fix issue376 - inconsistent punctuation in darcs get.
Eric Kow <eric.kow@gmail.com>**20061231180024

] 

[Fix issue367 - pull help message.
Eric Kow <eric.kow@gmail.com>**20061231174322] 

[Make annotate work on files with spaces in the name
edwin.thomson@businesswebsoftware.com**20061218094210

] 

[fix spelling errors in comments
Benedikt Schmidt <beschmi@cloaked.de>**20061222020037] 

[fix link error with gcc 4.12/glibc 2.4
Benedikt Schmidt <beschmi@cloaked.de>**20061220091436
 errno is a C macro that expands to a function call in
 some versions of glibc, so it can't be treated like
 a CInt there
] 

[Fix includes in External.hs.
Dave Love <fx@gnu.org>**20061218224158
 You can't put comments before {-# INCLUDE ...
] 

[Fix ssh.sh test.
Dave Love <fx@gnu.org>**20061218223442] 

[Prettify exceptions in identifyRepository.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20061218025453] 

[Implement prettyException.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20061218025440] 

[Simplify common libcurl errors.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20061218025419] 

[fix issue369 by failing if quickcheck isn't available
David Roundy <droundy@darcs.net>**20061218021545] 

[QP-encode bundles when putting to a remote repo.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20061218003034] 

[Don't QP-encode bundles when pushing locally.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20061218002533] 

[Make darcs push QP-encode the bundle before transferring.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20061217234635
 This should hopefully fix issues with scp/sftp corrupting bundles in transit.
] 

[Adapt callers to new calling convention for make_email.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20061217234608
 Use Just at the right places.
] 

[Make arguments to make_email optional.
Juliusz Chroboczek <jch@pps.jussieu.fr>**20061217234501
 Makes contents and filename optional.  If they are omitted, we still
 generate a conforming MIME message.
] 

[add warning about ALL and obliterate --all to documentation
Tommy Pettersson <ptp@lysator.liu.se>**20061219180302] 

[fix pending bug in darcs get --tag.
David Roundy <droundy@darcs.net>**20061217225256
 This patch addresses the bug displayed in Tommy's test:

 Mon Dec 11 20:28:21 CET 2006  Tommy Pettersson <ptp@lysator.liu.se>
   * add test for get --tag and pending
] 

[add test for get --tag and pending
Tommy Pettersson <ptp@lysator.liu.se>**20061211192821] 

[add new test related to issue262.
David Roundy <droundy@darcs.net>**20061217221041
 This issue seems to already have been fixed.
] 

[fix issue360, with darcs mv foo foo.
David Roundy <droundy@darcs.net>**20061217212340] 

[Separate comment from OPTIONS pragma for GHC 6.4 compatibility.
Eric Kow <eric.kow@gmail.com>**20061217041212

] 

[Resolve conflicts in David's hashed_inventory optimize patches.
Eric Kow <eric.kow@loria.fr>**20061217031027

] 

[Make hashed inventories support optimize and reordering.
David Roundy <droundy@darcs.net>**20061216193913] 

[Canonize Kirsten Chevalier.
Kirsten Chevalier <chevalier@alum.wellesley.edu>**20061217025004

 Added my name to the list of authors who originally only submitted an email
 address.

] 

[Documentation only - clarify meaning of --from and --author
Kirsten Chevalier <chevalier@alum.wellesley.edu>**20061217024927

 Clarified the meaning of --from and --author. I had assumed that these
 options also set the From: address on the email sent by "darcs sent".  Of
 course they don't, but it's better to make this clear.

] 

[Added test for reverting an unrecorded add
edwin.thomson@businesswebsoftware.com**20061215180047] 

[fix bug in haskell_policy check for HopefullyPrivate.
David Roundy <droundy@darcs.net>**20061210234453
 Perhaps with this test, we can rename it to CertainlyPrivate?  :)
] 

[don't use HopefullyPrivate outside of Hopefully.
David Roundy <droundy@darcs.net>**20061210231623
 The idea is to hide the Hopefully constructors, so I can hide some more
 information in there, if I like, which should be handy for the hashed
 inventories, and may also come in handy (for similar reasons) with git
 repositories.
] 

[change Maybe Patch to Hopefully Patch.
David Roundy <droundy@darcs.net>**20061210213536
 This rather pervasive change move us to using a new Hopefully type, which
 is similar to Either String for storing patches that may or may not exist.
 This should improve error reporting.  At a minimum it'll making easier to
 improve error reporting.
] 

[resolve conflict in white space.
David Roundy <droundy@darcs.net>**20061210211846] 

[fix pending bug that broke several_commands.sh.
David Roundy <droundy@darcs.net>**20061209223916] 

[add test for reverting removed directory
Tommy Pettersson <ptp@lysator.liu.se>**20061108202344] 

[allow commented tests in tests_to_run.
David Roundy <droundy@darcs.net>**20061211000322] 

[remove link to obsolete mirror of kernel repo.
David Roundy <droundy@darcs.net>**20061212012644] 

[add test that sigPIPE doesn't make darcs fail.
David Roundy <droundy@darcs.net>**20061209230155] 

[make optimize less DarcsRepo-specific.
David Roundy <droundy@darcs.net>**20061209205755] 

[Hard link support on Windows
Simon Marlow <simonmar@microsoft.com>*-20061204162040
 This works only on NTFS filesystems.  Also it requires Windows 2000 or
 later; this may or may not be acceptable, I'll leave that up to the
 darcs maintainers to decide.
] 

[eliminate DarcsRepo.am_in_repo.
David Roundy <droundy@darcs.net>**20061204153128
 This patch is a Good Thing, even though repair and optimize don't yet
 properly support anything bug old-fashioned repositories, because without
 it, when using such repositories, one can find those command operating on a
 different repository than intended (e.g. the test suite runs optimize on
 the darcs repository itself).  Now they'll fail as they ought to, when run
 on a repo format they don't support.
] 

[fix hashed inventory bug in add and prevent it happening again.
David Roundy <droundy@darcs.net>**20061204020823] 

[make get and put reuse initialize code.
David Roundy <droundy@darcs.net>**20061203220833
 This patch actually fixes put to properly accept and use any flags that
 init accepts, which is a Good Thing.  It also ensures that get behaves
 consistently with init in the future.  Also a Good Thing.
] 

[make put work with hashed inventories (and test for this).
David Roundy <droundy@darcs.net>**20061203211141] 

[make it an error to "put" into a preexisting directory.
David Roundy <droundy@darcs.net>**20061203205826
 This changes darcs' behavior I believe for the better.  Often one could be
 tempted to try to put into a directory, expecting to have the repository
 created as a subdirectory there, and it seems confusing (confused me) to
 have instead the repository contents mingled with whatever was already in
 that directory.  Put should behave like get in this regard, in that it
 shouldn't mix the new repo with a preexisting directory.
] 

[fix new get to not mess up pending (fixes latest hashed_inventory.sh tests).
David Roundy <droundy@darcs.net>**20061203173722] 

[add some more hashed_inventory.sh tests.
David Roundy <droundy@darcs.net>**20061203173207] 

[fix more incompatible uses of DarcsRepo.
David Roundy <droundy@darcs.net>**20061203064355] 

[make replace work with hashed inventories.
David Roundy <droundy@darcs.net>**20061203055452] 

[Make get_tag test work with hashed inventories.
David Roundy <droundy@darcs.net>**20061203055019] 

[make directory_confusion pass with hashed inventories.
David Roundy <droundy@darcs.net>**20061203035551
 I'm not sure whether there is still a bug in the pending handling here, but
 at least it doesn't crash...
] 

[catch exceptions in stdout_is_a_pipe
Simon Marlow <simonmar@microsoft.com>**20061129160620] 

[hFlush after "waiting for lock" message
Simon Marlow <simonmar@microsoft.com>**20061129160342
 On Windows, stdout isn't always in line-buffered mode, but we really
 want to see the message about waiting for a lock quickly.  Mostly
 because ^C isn't always caught properly on Windows and lock files are
 often left behind, but that's another storey...

] 

[add explicit import list
Simon Marlow <simonmar@microsoft.com>**20061129160144] 

[Improve error messages in push_cmd
chevalier@alum.wellesley.edu**20061207040701

 I ran into this because MSYS was munging my repository directory in a
 horrible way. This resulted in a bad repo directory getting passed into
 darcs, which resulted in a fromJust error, which we all know makes the
 baby Jesus cry. So, I at least refactored the code to give a better
 error message, though there may well be a better solution.
] 

[Hard link support on Windows
Simon Marlow <simonmar@microsoft.com>**20061204162040
 This works only on NTFS filesystems.  Also it requires Windows 2000 or
 later; this may or may not be acceptable, I'll leave that up to the
 darcs maintainers to decide.
] 

[adapt test sametwice to new obliterate --all feature
Tommy Pettersson <ptp@lysator.liu.se>**20061130132058] 

[Adapt test perms.sh to obliterate --all feature.
Eric Kow <eric.kow@gmail.com>**20061209200625] 

[fix for Issue111, obliterate --all
David Roundy <droundy@darcs.net>**20061129164016
 This is a patch to implement the wishless item Issue111,
 which asks for an --all option to obliterate.  The idea is
 that you might use the --patches flag to select a bunch of
 patches and not want to have to say yess to all of them.

 For good measure, I also added it to unpull and unrecord.
] 

[use impossible to document impossible case in Repair.
David Roundy <droundy@darcs.net>**20061204152854] 

[use variable TEST_FILTER_FILE in makefile.
David Roundy <droundy@darcs.net>**20061204151217] 

[configure should fail if a required module isn't present.
David Roundy <droundy@darcs.net>**20061128024557] 

[Remove raw_mode functions from atomic_create.h.
Eric Kow <eric.kow@gmail.com>**20061008202738

 It seems these were once implemented in compat.c and have since been
 reimplemented in Haskell by Ian Lynagh on 2005-07-30.  These appear to
 just be leftover declarations in the C header.

] 

[resolve conflicts
Tommy Pettersson <ptp@lysator.liu.se>**20061117222757
 between 'clean up unrevert and pending handling'
 and 'ignore failure from hSetBufferin'
] 

[ignore failure from hSetBuffering
Tommy Pettersson <ptp@lysator.liu.se>**20061117221424
 This affects:
   issue41      Doesn't like pasted text.
   issue94      Crash on bogus input
   issue146     hSetBuffering: invalid argument
   issue318     buffering error of darcs record under bash/cmd.exe
 It doesn't necessarily "fix" anything. It prevents darcs from quiting,
 instead continuing with perhaps an undesirable buffering mode, which may or
 may not be better ... or worse.
] 

[Fix curses stuff, especially on Solaris 10.
Dave Love <fx@gnu.org>**20061120171211] 

[TAG 1.0.9rc2
Tommy Pettersson <ptp@lysator.liu.se>**20061116140351] 

(snipped)