[darcs-users] darcs apply --mark-conflicts problems

[Terrence Brannon]

Ok, the file I am having problems with is this one:

http://scannedinavian.org/cgi-bin/darcs.cgi/craft-of-fp/ex/ex7.hs?c=patches

I pushed some changes from one machine to scannedinavian.org just as
I normally do. However, I used an old repo copy to add a sort function
(you can see that in the submit made from thinkpad-560e).

Now, the problem is when I tried to record and push the small addition
from the thinkpad, i was told that darcs would not push it because
there were conflicts. 

It then told me to use apply with --mark-conflicts. I naively did this
locally and darcs just hung. Then someone on #darcs told me that was a
server-side thing to do.

so, I did this on the thinkpad:

  darcs send -o patch.darcs

and then scp'ed it to scannedinavian.org. I then did

darcs apply --mark-conflicts patch.darcs

It then applied it and put a lot of warpaint in the file, which
apparenly shows how it resolved the conflicts.

Everything looked good. I did a darcs pull on the thinkpad, and then
deleted all the "warpaint" from the file. I then tried to push the
version with the markings removed and darcs complained:

refusing to apply patches leading to conflicts. If you would rather
apply the patch and mark the conflicts, use --mark-conflicts option to
apply.

So my questions are:

1 - how should I have gotten the conflict symbols out of the file?
2 - I manually erased the conflict symbols in a version of ex7.hs that
I got via darcs pull, but I cannot push them. How do I tell darcs to
forget about what I recorded and am trying to push? It keeps asking me
about it and apparently will until the end of time unless I get it to
leave me alone. I actually have the edits I did removing the warpaint
stored via another darcs send -o darcs.patch2, but again on
server-side, darcs apply is refusing to apply them. I suppose I could
--allow-conflicts, but I am not sure if I should, it would've worked
out fine the first time had I done this.

-- 
	Carter's Compass: I know I'm on the right track when,
	   by deleting something, I'm adding functionality.