Hi, Jason Dagit <[EMAIL PROTECTED]> writes: > The bad news is that my patches will definitely collide with the ones that > mornfall recently sent. The other bad news is that while I was recording > them in compilation order, I screwed that order up when I got to the end > due to forgetting to unrecord one or two patches. I think I've unrecorded > all the duplicates now though. I have tried to apply the bundle to my repository, and it seems there's only a bunch of conflicts in Repair, which doesn't seem so bad. I have to sleep now, but I'll review them tomorrow and try to come up with a resolution patch, or amend Jason's changes maybe (there seem to be only 3 touching Repair.lhs, whereas I have some 7).
Yours, Petr. -- Peter Rockai | me()mornfall!net | prockai()redhat!com http://blog.mornfall.net | http://web.mornfall.net "In My Egotistical Opinion, most people's C programs should be indented six feet downward and covered with dirt." -- Blair P. Houghton on the subject of C program indentation _______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
