[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Quilt-dev] address@hidden: Bug#298788: Desirable new feature: quilt
|
From: |
Catalin Marinas |
|
Subject: |
Re: [Quilt-dev] address@hidden: Bug#298788: Desirable new feature: quilt merge] |
|
Date: |
Thu, 10 Mar 2005 13:10:36 +0000 |
|
User-agent: |
Gnus/5.1007 (Gnus v5.10.7) Emacs/21.3 (gnu/linux) |
Martin Quinson <address@hidden> 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