Martin Quinson <[EMAIL PROTECTED]> wrote: > also from the debian BTS. I dunno what to think about it. I never forked any > patch, so I've no idea about merging them afterward ;)
Assuming that you only try to merge forked patches, a diff3 merge could be performed between the common ancestor of all the files, the old patch and the newly forked one. The common ancestor is easy since you get it in .pc/patch/file, the local file is one of the descendants and 2nd descendant is generated by applying the forked patch to the ancestor. Catalin -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
