Conversation
eemeli@mefi.social

Eemeli Aro

As I'm migrating Mozilla's localization repositories from hg to git, I'm contemplating doing an octopus merge of 156 branches with unrelated histories. According to @torvalds from 2013, that's clearly a Cthulhu merge.

But has anyone tried something like this recently? Will it "just work", or are there odd limits (of sanity or otherwise) that this might be breaking?

2
0
0
torvalds

Linus Torvalds

Reply to @eemeli@mefi.social

@eemeli Don’t do it.

Yes, it’s funny to do, and maybe git has no problems with it. Maybe.

But all the visualization tools will be ugly if they work at all. Just look at

`git show --cc 2cde51fbd0f3`

in the kernel repo and that’s a paltry 66 parents. We have a number of other “big” octopus merges, but we’ve avoided anything even that big since.

So even if things work, you just get into issues like “my terminal window isn’t that wide”.

0
0
1
pronoiac@mefi.social

James Y🎃ung

Reply to @eemeli@mefi.social

@eemeli @torvalds you might ping @b0rk , possibly to be a cautionary tale of things not to do with

0
0
0
About social.kernel.org

Terms of service

  1. Please do not use this service in violation of the Linux Kernel Code of Conduct. Doing so will result in your account suspension with the referral of the matter to the CoC committee.

  2. "Repeating"/"boosting" someone else's status on this platform will be treated as endorsement and will fall under rule #1.

  3. You are encouraged to use this platform to promote your work on the Linux Kernel, but there is no restriction on permitted topics (with the exception of anything covered by #1 above).

  4. There is no requirement to post in English, but it should be considered the primary language of communication on this platform.

Privacy notice

The admins of this service have access to all posted statuses. They aren't looking, but if it's something they shouldn't know about, then you should not post it on this platform.

Please see the Linux Foundation Privacy Policy, which applies to this platform as well.

Getting your own account

If you would like an account on this instance, please check that the following applies to you:

  • You are listed in MAINTAINERS or CREDITS

  • OR: You have a kernel.org account or email address

  • OR: You have a long and established history of involvement with the Linux Kernel

If the above is true and you agree with the Terms of Service and Privacy Notice listed above, please use these instructions to request an account: