From: Catalin Marinas <catalin.marinas@gmail.com>
To: Jan Veldeman <jan.veldeman@gmail.com>
Cc: Daniel Barkalow <barkalow@iabervon.org>, git@vger.kernel.org
Subject: Re: [RFC] Stgit - patch history / add extra parents
Date: Wed, 31 Aug 2005 10:12:11 +0100 [thread overview]
Message-ID: <tnxhdd6o4gk.fsf@arm.com> (raw)
In-Reply-To: <20050823212305.GA5936@fanta> (Jan Veldeman's message of "Tue, 23 Aug 2005 23:23:05 +0200")
Jan Veldeman <jan.veldeman@gmail.com> wrote:
> The parents which should be visible to the outside, will always be versions
> of my development tree, which I have previously pushed out. My way of
> working would become:
> * make changes, all over the place, using stgit
> * still make changes (none of these gets tracked, intermittent versions are
> lost)
> * having a good day: changes looks good, I want to push this out:
> * push my tree out
> * stgit-free (which makes the pushed out commits, the new parents of my
> stgit patches)
When the tree status looks good, you could tag it and the whole stack
(the commits corresponding to the patches) would be available via this
tag.
As I said, I agree with the idea of freezing a patch and even having
multiple parents to a commit but this commit should not be visible via
HEAD. We could have another id for a patch, 'frozen', which stores the
last frozen state with the parents being the previous frozen
states. Its SHA1 value could be accessed via 'stg id <patch>/frozen'
(in the same way as /top and /bottom ids).
--
Catalin
next prev parent reply other threads:[~2005-08-31 9:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-18 19:57 [RFC] Stgit - patch history / add extra parents Jan Veldeman
2005-08-19 9:53 ` Catalin Marinas
2005-08-19 18:27 ` Jan Veldeman
2005-08-19 22:15 ` Catalin Marinas
2005-08-19 19:48 ` Jan Veldeman
2005-08-20 21:12 ` Catalin Marinas
2005-08-21 9:40 ` Jan Veldeman
2005-08-22 22:10 ` Daniel Barkalow
2005-08-23 16:55 ` Catalin Marinas
2005-08-23 18:05 ` Daniel Barkalow
2005-08-23 21:23 ` Jan Veldeman
2005-08-23 22:23 ` Daniel Barkalow
2005-08-25 7:09 ` Jan Veldeman
2005-08-25 19:41 ` Daniel Barkalow
2005-08-31 9:27 ` Catalin Marinas
2005-08-31 9:12 ` Catalin Marinas [this message]
2005-08-30 21:41 ` Catalin Marinas
2005-08-31 8:59 ` Jan Veldeman
2005-08-31 17:17 ` Daniel Barkalow
2005-08-24 0:23 ` Junio C Hamano
2005-08-24 2:26 ` Linus Torvalds
2005-08-23 1:06 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tnxhdd6o4gk.fsf@arm.com \
--to=catalin.marinas@gmail.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=jan.veldeman@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).