On Thu, Jul 28, 2005 at 04:34:43AM +0000, Terrence Brannon wrote: > 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.
That would be one way, but probably not the best. > It then applied it and put a lot of warpaint in the file, which > apparenly shows how it resolved the conflicts. No, it's showing you where the conflicts are so that /you/ can resolve them. You need to clean up the affected files and then record the change. It sounds like you might have tried this and got a 'no changes' message. In that case, you need to use 'darcs record --ask-deps', and specify the conflicting patch. Arguably a UI bug... > Everything looked good. I did a darcs pull on the thinkpad, and then > deleted all the "warpaint" from the file. This pull presumably also got the patches with which your latest patch was conflicting? You now have the conflict marked in two places, which is the problem. > I then tried to push the > version with the markings removed and darcs complained: Sounds like you still have the conflict markers sitting unrecorded on the server. Do a darcs revert there to remove them and try again. > 1 - how should I have gotten the conflict symbols out of the file? When the first push failed, you should have pulled the conflicting patches from the server. This would cause the conflicts to be marked locally, and you can then resolve them, record, and push. No need to touch the server. > 2 - I manually erased the conflict symbols in a version of ex7.hs that > I got via darcs pull, but I cannot push them. That's because either you or the darcs conflict marker has made conflicting changes at both ends. > How do I tell darcs to > forget about what I recorded and am trying to push? Use 'darcs revert' if the relevant changes are not recorded. 'darcs unpull' if they are (or unrecord if you want to be more cautious/selective). You may need to do this for both repos. You shouldn't need to do this though, unless you've ended up recording duplicate edits, in which case only unpull one of them. > 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. It's failing for exactly the same reason as the push. In general there's nothing to be gained using send/apply. You only really need to use them when you're emailing patches. > 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. No, that wouldn't work. You'd still have an unresolved conflict lying about. Sorry if that was all a little vague. If you still have trouble, it would help to know exactly which patches and what unrecorded changes you have on the laptop and server, i.e. the output of changes and whatsnew for each. -- Jamie Webb _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
