On 2007-02-28 13:11:02 +0900, TAKAHASHI Tamotsu wrote: > Hi Brendan, > > * Tue Feb 27 2007 Brendan Cully <[EMAIL PROTECTED]> > > For the record, to revert the diff: hg diff -r 4793:4792 | patch -p1. > > There was a minor conflict in UPDATING, easily fixed. hg backout would > > have done about the same thing. > > Thanks, I didn't know both reverse-diff and backout. > Now I like Mercurial more than ever. > And I'd better read the whole manual.
Wouldn't "hg merge" be a better solution? (Perhaps no differences here, but I wonder if diff/patch still works with binary files or when files are copied, removed and so on.) -- Vincent Lefèvre <[EMAIL PROTECTED]> - Web: <http://www.vinc17.org/> 100% accessible validated (X)HTML - Blog: <http://www.vinc17.org/blog/> Work: CR INRIA - computer arithmetic / Arenaire project (LIP, ENS-Lyon)
