On Sat, Jan 07, 2006 at 09:52:03PM +0100, Tommy Pettersson wrote: > > People have now pulled from repo P2, and there has been one patch > > applied. Now we wish to pull patches from P2 into P - so we deleted s > > from P, recorded, and tried to pull from P2. > > > > We get: (s is taint.lisp, ignore the others) > > --------------------------------------- > > diffing dir... > > We have conflicts in the following files: > > ./taint.lisp > > You have conflicting local changes to: > > ./cl-taint.asd ./taint-doc.html > > Proceed? [yn] y > > Applying patches to the local directories... > > --------------------------------------- > > > > and s is not in the directory! > > One line of history creates a file ./utils/tainted.lisp, > renames it to ./tainted.lisp, modifies it in several steps, and > finally removes it. The other (conflicting) line of history > creates a file ./tainted.lisp and modifies it. Now, should > there or should there not be a file named ./tainted.lisp, > and if so, what should it contain? Darcs can't tell, but it > tries to help by doing its conflict markup, and alas darcs > currently performs very poorly on addfile/rmfile conflicts. > The result in your case was: no file.
Aaaah, I see it all now. I copied over tainted.lisp from P2 and that changed the conflict resolution patch to "add the contents of tainted.lisp" instead of "remove tainted.lisp". It all makes sense now! Thanks for your help, Alan _______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
