Branches to patches
jw+debian at jameswestby.net
Thu Apr 3 10:38:58 UTC 2008
On Thu, 2008-04-03 at 10:58 +0200, Teemu Ikonen wrote:
> Stefano Zacchiroli wrote:
> > However in general it is not possible to
> > require that all patches apply properly to pristine source. In some
> > (rare fortunately) cases two patches will conflict with each other on
> > the pristine source and you need to make one depend on the other or the
> > other way round.
> 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.
This is interesting, thanks for sharing it.
I made a simple test case locally, and it doesn't quite seem to do what
The quite series ends up looking like
remove the change in first patch that will conflict with a change in
the 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.
More information about the vcs-pkg-discuss