The following is the output of exact-version and resolve.
Let me know if you need any additional files.
Thank you in advance,
Noam

research% darcs --exact-version
darcs compiled on Mar  4 2006, at 21:34:19
# configured Tue Feb 28 07:02:39 EST 2006
./configure --no-create --no-recursion

Context:

[TAG 1.0.6
Tommy Pettersson <ptp@lysator.liu.se>**20060228111841] 

research% darcs resolve
darcs: bug in darcs!
Problem resolving conflicts in resolve!user error (Error applying hunk to file ./LAD_Boost.tex)
Please report this to bugs@darcs.net,
If possible include the output of 'darcs --exact-version'.

Attachments

• unnamed

On Sat, Jul 08, 2006 at 03:52:07PM +0000, Noam Goldberg wrote:
> research% darcs resolve
> darcs: bug in darcs!
> Problem resolving conflicts in resolve!user error (Error applying hunk to file ./LAD_Boost.tex)

What does 'darcs check' in this repo print?

I now have a repo where I can reproduce this bug, with darcs 1.0.7, 1.0.8, 1.0.9
and current stable.

Tommy, 

Are you also able to reproduce the bug with Darcs2? And how about after a "darcs
convert" on a repository? 

Also, having a minimal test case would also be interesting, if that's possible. 

  Mark

Tommy,

Just poking.
Does mark-conflicts in darcs 2.0.0 still break on your sample repository?
What about if you convert the repository?

Darcs 2.0.2 (+ 5 patches) works, and marks the conflicts
successfully in the old-format repository. After I convert the
repository to darcs-2 format, there are no longer any conflicts
to mark. I think they disappear during the lossy conversion of
complicated conflicts.

The (previously) failing repository is an untagged version of a
post-1.0.9 darcs code repository, so it won't make a good
minimal test case.

Marking resolved, then.  Thanks!