>>>> "APA" == Adrian Aichner
APA> This one ain't pretty.
APA> Malcolm, Steve, there's another one where Steve is undoing
APA> changes by Malcolm.
APA> I guess you both need to revisit today's commits.
No, it's fine. Conflicts happen when you have an open process, that's
all. Malcolm's commit wedged my script's idea of process state, so I
unwound back to where stuff made sense and fixed my release config
stuff, then recommitted what needed committing. Everything is where
it should be now: Malcolm's log is in, the autoload cookie is in, the
logs claiming that a release has happened are out. The r21-5-24 tag
is inconsistent state, but since there's been no release announcement,
and it'll be reset in a couple days, I don't think it's going to hurt
School of Systems and Information Engineering http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.