From: Jonas Smedegaard <dr@jones.dk>
To: git@vger.kernel.org
Cc: pasky@suse.cz, u.kleine-koenig@pengutronix.de,
martin f krafft <madduck@madduck.net>
Subject: Re: [TopGit] Multiple concurrent sets of patches
Date: Tue, 3 Mar 2009 20:22:21 +0100 [thread overview]
Message-ID: <20090303192221.GV12820@jones.dk> (raw)
In-Reply-To: <20090303130316.GA17702@piper.oerlikon.madduck.net>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On Tue, Mar 03, 2009 at 02:03:16PM +0100, martin f krafft wrote:
>also sprach Jonas Smedegaard <dr@jones.dk> [2009.03.03.1237 +0100]:
>> 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.
>
>Let me try to understand you: you want TopGit to maintain a single
>feature branch against two different source branches? How should
>that work? Could you elaborate a bit so that your needs become a bit
>more obvious?
Not quite. I want TopGit to maintain multiple feature branches,
preferrably related.
With "related" I mean that I would like to be able to "fork" a chain of
interdependent feature branches.
TopGit easily support one chain of branches:
upstream + pristine-tar -> master -> build
I want TopGit to additionally support the following:
upstream + pristine-tar -> stable-master -> stable-build
upstream + pristine-tar -> oldstable-master -> oldstable-build
E.g. in addition to TopGit branches t/fix_01 and t/feature_01 I would
want to fork those branches as t_stable/fix_01 and t_stable/feature_01.
I know that I can create all those TopGit branches one by one, but I
would then need to explicitly declare a list of TopGit branches to apply
each time I want to (re)generate a quilt patchlist.
Perhaps what I really am looking for here is something like "tg tag":
git checkout t/fix_01
tg tag t/fix_01 master
git checkout -b t_stable/fix_01 t/fix_01
tg tag -d master
tg tag stable
git checkout stable_build
./debian/rules tg-export tags=stable
...or perhaps this is not relevant upstream to TopGit at all but only to
your packaging of a "tg-export" rule?
- Jonas
- --
* 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)
iEYEARECAAYFAkmtg20ACgkQn7DbMsAkQLhQGQCfQjtfJzzQUu6B0qywpkmxmdGp
66oAnjEtR2Dc/zJ+lMoP3TD3jy1pr1s9
=MwTs
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2009-03-03 19:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-03 11:37 [TopGit] Multiple concurrent sets of patches Jonas Smedegaard
2009-03-03 13:03 ` martin f krafft
2009-03-03 19:22 ` Jonas Smedegaard [this message]
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=20090303192221.GV12820@jones.dk \
--to=dr@jones.dk \
--cc=git@vger.kernel.org \
--cc=madduck@madduck.net \
--cc=pasky@suse.cz \
--cc=u.kleine-koenig@pengutronix.de \
/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