Using quilt to store patches
martin f krafft
madduck at debian.org
Fri May 22 22:55:57 UTC 2009
also sprach Mehdi Dogguy <mehdi.dogguy at pps.jussieu.fr> [2009.05.22.1602 +0200]:
> - Modify other patches and rebase (if needed).
I don't know what you mean with that.
> - Move back to branch master and save patches:
>
> rm -f debian/patches/*
> git format-patch -N -o debian/patches upstream...patch-queue | \
> sed -e 's%debian/patches/%%' > debian/patches/series
> git branch -d patch-queue
>
> Now:
> - all patches are saved in debian/patches/ and can be used directly with
> quilt.
Yes, and you can use TopGit to actually develop features on all
those TopGit branches, from which you can create that initial patch
series.
Now we need to figure out how to get the conflict resolutions you
made during your git-am loop back onto the TopGit branches where
their features are developed.
This is the advantage of TopGit: it's centred around the idea of
keeping changes to a feature very close to the feature's branch.
Inevitably, there will be dependencies between patches.
> Is this a known way of managing patches? or are there similar methods?
You should look at TopGit and help us remove the complexity that
deters you currently. ;)
--
.''`. martin f. krafft <madduck at d.o> Related projects:
: :' : proud Debian developer http://debiansystem.info
`. `'` http://people.debian.org/~madduck http://vcs-pkg.org
`- Debian - when you have better things to do than fixing systems
"when faced with a new problem, the wise algorithmist
will first attempt to classify it as np-complete.
this will avoid many tears and tantrums as
algorithm after algorithm fails."
-- g. niruta
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature (see http://martin-krafft.net/gpg/)
URL: <http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20090523/c23f25df/attachment.pgp>
More information about the vcs-pkg-discuss
mailing list