* Zachary Amsden (zach at vmware.com) wrote: > Jeremy Fitzhardinge wrote: > > Rusty Russell wrote: > >> OK, I hacked up a canonicalization script. Please use this before > >> checking in patch changes (just run bin/canonicalize-patches). > > Oh, no, please don't. That just made a massive, massive merge mess. > > > > Zach, can you be convinced to use mq? If we have any hope of being > > able to merge conflicting diff differences, they need to be as similar > > as possible, including having the same context ranges, file order, > > etc. I'm concerned that we're going to be just dealing with masses of > > noise merges otherwise. > > Yes. Where do I get it? mq is part of mercurial (starting in 0.8 or so). All you need to know is documented here: http://www.selenic.com/mercurial/wiki/index.cgi/MqExtension holler if you need any help. thanks, -chris
