On Thu, Jul 12, 2012 at 9:12 PM, Tony "Chainsaw" Vroon <chain...@gentoo.org> wrote: > On Thu, 2012-07-12 at 21:09 +0200, Dirkjan Ochtman wrote: >> Maybe Tony mismerged your changes into his? > > Thank you for your trust in me. > cvs commit -m completed non-interactively, without notification of > conflict or request to merge.
I certainly didn't mean to accuse you; I hoped to convey that this happened accidentally, which in my experience happens once in a while (though a problem with the tools might be more likely). Cheers, Dirkjan