From: Junio C Hamano <junkio@cox•net>
To: Linus Torvalds <torvalds@osdl•org>
Cc: "Brown, Len" <len.brown@intel•com>,
Git Mailing List <git@vger•kernel.org>,
Paul Mackerras <paulus@samba•org>,
Marco Costalba <mcostalba@yahoo•it>,
Aneesh Kumar <aneesh.kumar@gmail•com>
Subject: Re: The merge from hell...
Date: Thu, 02 Feb 2006 22:28:43 -0800 [thread overview]
Message-ID: <7vbqxpj6qs.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0602022139190.3462@g5.osdl.org> (Linus Torvalds's message of "Thu, 2 Feb 2006 21:45:57 -0800 (PST)")
Linus Torvalds <torvalds@osdl•org> writes:
> The 12-way merge was a bit over the top, but it worked. I'd suggest not
> beign quite _that_ aggressive in the future, though, but it's not a big
> deal.
Heh, I was quietly planning to raise the limit, or lift it
altogether ;-).
I find Len's explanation that those topics cooked independently
and happened to mature at about the same time an excellent
excuse to record this as an Octopus, and with that usage there
is no inherent reason, other than making the diff completely
unreadable, to limit the number of parents. But I tend to agree
that the current 16 is a sane limit in practice.
That reminds me of another practical limit I've known but did
nothing about for quite some time (you may not even remember
doing that parser anymore). This does not work for Len's merge:
$ git rev-parse --verify funmerge^10
You could do a 16-way merge but 12-way is already hitting
usability limit, depending on what you would want to do with
them. For example, you cannot easily decompose the topic
branches out of that merge, like this:
$ git checkout -b redo-3549 funmerge^2 ;# works
$ git checkout -b redo-pnpacpi funmerge^12 ;# doesn't
> One thing I'd ask for: would it be possible to have more descriptive
> branch names than just numbers? Even if you want to track it by bugzilla
> entry number, how about calling it "bugzilla-12345" instead?
When kernel people (not just Len) talk about a "bugzilla ID",
does that ID always come from the same namespace, or do some
subsystems have their own bugzilla?
next prev parent reply other threads:[~2006-02-03 6:28 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-03 4:20 The merge from hell Brown, Len
2006-02-03 5:45 ` Linus Torvalds
2006-02-03 6:28 ` Junio C Hamano [this message]
2006-02-03 7:48 ` [PATCH] get_sha1_1: allow octopus^12 to be properly parsed Junio C Hamano
2006-02-03 16:21 ` The merge from hell Dave Jones
-- strict thread matches above, loose matches on Subject: below --
2006-02-03 18:34 Brown, Len
2006-02-04 2:35 ` Junio C Hamano
2006-02-04 2:47 ` Linus Torvalds
2006-02-03 6:41 linux
2006-02-03 6:04 Brown, Len
2006-02-03 6:16 ` Linus Torvalds
2006-02-03 6:33 ` Junio C Hamano
2006-02-02 6:28 Linus Torvalds
2006-02-02 7:05 ` Junio C Hamano
2006-02-02 7:51 ` Linus Torvalds
2006-02-02 7:55 ` Linus Torvalds
2006-02-02 8:08 ` Linus Torvalds
2006-02-04 10:46 ` Paul Mackerras
2006-02-04 12:22 ` Junio C Hamano
2006-02-04 19:42 ` Linus Torvalds
2006-02-04 20:59 ` Linus Torvalds
2006-02-02 7:25 ` Marco Costalba
2006-02-02 8:02 ` Linus Torvalds
2006-02-02 8:07 ` Aneesh Kumar
2006-02-02 8:27 ` Junio C Hamano
2006-02-02 8:44 ` Linus Torvalds
2006-02-02 10:41 ` Junio C Hamano
2006-02-05 19:42 ` Linus Torvalds
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=7vbqxpj6qs.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox$(echo .)net \
--cc=aneesh.kumar@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=len.brown@intel$(echo .)com \
--cc=mcostalba@yahoo$(echo .)it \
--cc=paulus@samba$(echo .)org \
--cc=torvalds@osdl$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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