From: Jonas Smedegaard <dr@jones.dk>
To: git@vger.kernel.org
Subject: [TopGit] Multiple concurrent sets of patches
Date: Tue, 3 Mar 2009 12:37:41 +0100 [thread overview]
Message-ID: <20090303113741.GO12820@jones.dk> (raw)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
I have run into a challenge that I suspect is a limitation of current
TopGit. I am hoping you could help enlighten me, as I otherwise feel
that TopGit is not generally usable for my Debian packaging needs:
How to manage patches against multiple source branches using TopGit?
Let's take netatalk as an example. Upstream only quite infrequently
release new upstream tarball releases, so I cherry-pick patches from
upstream VCS. Recently a security-related bug was discovered which
needed fixing not only in the current packaging development (git master
branch) but also needed branching off earlier releases of the package
(those included in the "stable" and "oldstable" Debian distro releases)
and applying same fix for them.
The actual patch needed for the various branches was obviously not
identical, as upstream sources were different and my cherry-picked set
of patches had evolved.
It seems to me that TopGit is incapable of handling this. That it can
only handle patchset against a single branch, and if the need arise for
restructuring an additional patchset for e.g. a stable or oldstable
branch, then quilt needs to be used manually anyway.
- Jonas
Debian developer
- --
* Jonas Smedegaard - idealist og Internet-arkitekt
* Tlf.: +45 40843136 Website: http://dr.jones.dk/
[x] quote me freely [ ] ask before reusing [ ] keep private
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkmtFoUACgkQn7DbMsAkQLgvrACdHfy5K0igPa6Yj/LYyhh3Llyn
jvcAnRfla1QyuUrx8+L4IL9XYY2CB+Su
=B1Kc
-----END PGP SIGNATURE-----
next reply other threads:[~2009-03-03 11:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-03 11:37 Jonas Smedegaard [this message]
2009-03-03 13:03 ` [TopGit] Multiple concurrent sets of patches martin f krafft
2009-03-03 19:22 ` Jonas Smedegaard
2009-03-03 19:42 ` Uwe Kleine-König
2009-03-03 22:07 ` Jonas Smedegaard
2009-03-04 7:16 ` martin f krafft
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090303113741.GO12820@jones.dk \
--to=dr@jones.dk \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox