[darcs-devel] [issue1043] darcs2 cannot apply conflicting patch

[Florent Becker]

New submission from Florent Becker <florent.becker at ens-lyon.org>:

I have a repository at http://code.haskell.org/~galbolle/darcs2-bug/darcs-doc/
which tracks http://darcs.net with some (quite a lot of) conflicts.

I resolved these conflicts and recorded the resolutions, but when I try to pull
>Wed Aug 27 12:58:43 CEST 2008  Dmitry Kurochkin <dmitry.kurochkin at gmail.com>
>  * Refactor get_matcher and apply_inv_to_matcher functions from Darcs.Match
>module.
i get the following error:
darcs: mergeAfterConflicting failed in geteff

then a huge where ix is, which i attach.

----------
messages: 5798
nosy: Serware, dagit, galbolle, kowey
priority: bug
status: unread
title: darcs2 cannot apply conflicting patch
topic: Conflicts, Darcs2, IncludesExampleOrTest

__________________________________
Darcs bug tracker <bugs at darcs.net>
<http://bugs.darcs.net/issue1043>
__________________________________