From: Andreas Ericsson <ae@op5.se>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: n-heads and patch dependency chains
Date: Fri, 21 Apr 2006 10:50:44 +0200 [thread overview]
Message-ID: <44489CE4.1050101@op5.se> (raw)
In-Reply-To: <7v4q0oyt3w.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
> Jon Loeliger <jdl@freescale.com> writes:
>
>
>>On Tue, 2006-04-04 at 06:47, Andreas Ericsson wrote:
>>
>>
>>>No, I mean that this would commit both to the testing branch (being the
>>>result of several merged topic-branches) and to the topic-branch merged
>>>in. Commit as in regular commit, with a commit-message and a patch. The
>>>resulting repository would be the exact same as if the change was
>>>committed only to the topic-branch and then cherry-picked on to the
>>>testing-branch.
>
>
> To be consistent, I think the result should be "as if the change
> was commited only to the topic-branch and then the topic-branch
> was *merged* into the testing-branch", since you start your
> testing branch as "being the result of several merged topic-branches".
>
> I do that (manually) all the time, with:
>
> $ git checkout next
> $ hack hack hack
>
> $ git checkout -m one/topic
> $ git commit -o this-path that-path
> $ git checkout next
> $ git pull . one/topic
>
> Giving a short-hand for the last four-command sequence would
> certainly be nice.
>
Ah. That's easier than what I originally looked at doing.
>
>>I am your number one fan! If I finish reading these 600+
>>messages, will I find out you have already implemented it,
>>it's committed, and you just need me to test it now? :-)
>
>
> Likewise... ;-)
>
Sorry to disappoint you so far. I'll see if I can turn up my
shell-skills a notch or two and get the hang of the commit-script enough
to implement it.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
next prev parent reply other threads:[~2006-04-21 8:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-03 7:48 n-heads and patch dependency chains Sam Vilain
2006-04-03 14:29 ` Linus Torvalds
2006-04-03 15:38 ` Sam Vilain
2006-04-03 19:37 ` Junio C Hamano
2006-04-03 23:55 ` Sam Vilain
2006-04-04 9:28 ` Andreas Ericsson
2006-04-04 9:51 ` Junio C Hamano
2006-04-04 10:44 ` Andreas Ericsson
2006-04-04 11:03 ` Jakub Narebski
2006-04-04 11:47 ` Andreas Ericsson
2006-04-20 18:08 ` Jon Loeliger
2006-04-20 18:55 ` Junio C Hamano
2006-04-21 8:50 ` Andreas Ericsson [this message]
2006-04-04 19:00 ` Junio C Hamano
2006-04-04 20:18 ` Jakub Narebski
2006-04-05 6:34 ` Sam Vilain
2006-04-05 7:11 ` Jakub Narebski
2006-04-05 7:31 ` Sam Vilain
2006-04-05 7:59 ` Jakub Narebski
2006-04-04 0:51 ` Jakub Narebski
2006-04-04 11:05 ` Catalin Marinas
-- strict thread matches above, loose matches on Subject: below --
2006-04-03 22:13 linux
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=44489CE4.1050101@op5.se \
--to=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).