On Thu, Jun 15, 2006 at 06:09:28PM +0200, Christian Perrier <[EMAIL PROTECTED]> was heard to say: > Quoting Kobayashi Noritada ([EMAIL PROTECTED]): > > Hi, > > > > I've updated the patch since some English documents have been updated > > after my submitting the previous patch and also a .patch file included > > in the previous one cannot be applied to the latest version of the > > public copy any more. > > > > Following files are included in a patch attached. A mark "[UPDATED]" > > means it is updated from one included in the previous patch. > > Please commit these files when you have time. > > > To solve this out, I hereby suggest that Daniel applies this patch and > the one you sent later after discovering an error, *to his archive and > its public copy* > > I will then resync my own archive with that public copy. > > In short, Daniel, better NOT try to apply the 5 patches you have > pending from me.....then I'll resync with you.
OK, I've applied them. Unless there's stuff in the previous patches that you want to preserve, you'll probably want to obliterate them before trying to sync up. (if you aren't sure whether you want to hold on to them, you can make a backup branch before obliterating) Daniel
signature.asc
Description: Digital signature
