Branches to patches

[Teemu Ikonen]

On Thu, Apr 3, 2008 at 12:38 PM, James Westby <jw+debian at jameswestby.net> wrote:
> On Thu, 2008-04-03 at 10:58 +0200, Teemu Ikonen wrote:
> > I've made a python program (actually a rather thin wrapper around git
>  > and various tools from patchutils) which makes this transformation
>  > from an upstream branch, a set of feature branches and an integration
>  > branch stored in git to a series of patch files. It's called
>  > git-genpatches and is attached to this mail. The revert patches
>  > between feature patches are made by python program minrevert (also
>  > attached) which takes patches A and B and outputs a patch reverting
>  > those hunks in patch A which overlap with hunks in patch B.
>  I made a simple test case locally, and it doesn't quite seem to do what
>  I expect.

Well, as I wrote, the code is more like a proof of concept :)

>  The quite series ends up looking like
>
>   first patch
>   remove the change in first patch that will conflict with a change in
>      the second patch
>   second patch
>   revert all the changes made by second patch and the remaining changes
>      made by the first patch.
>
>  It seems like the logic is just slightly wrong, or I may be using it
>  wrong, but it means that a "quilt push -a" just leaves me with the
>  original upstream file.

I fixed some bugs yesterday after not looking at the code for a while,
so I probably introduced more bugs than I fixed. I don't have access
to the code ATM, but I'll have a look at it in the evening. If there's
interest I'll also publish the git repo for this somewhere.

And, if you have a publicly accessible repository I could test the
code against, that would be great. Making artificial test cases for
this is both tedious, and apparently does not catch all mistakes.

Best,

Teemu