From: Jonathan Nieder <jrnieder@gmail.com>
To: Ian Hobson <ian@ianhobson.co.uk>
Cc: git@vger.kernel.org
Subject: Re: Handling multiple parallel versions.
Date: Wed, 21 Jul 2010 11:59:52 -0500 [thread overview]
Message-ID: <20100721165952.GA14144@burratino> (raw)
In-Reply-To: <4C471223.9050303@ianhobson.co.uk>
Hi Ian,
Ian Hobson wrote:
> O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O Master
> | \
> | O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O London
> |
> | \ O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O Birmingham
> |
> | \ O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O Glasgow
> |
> | \ O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O Sheffield
> |
> \ O--O--O--O--O--O--O--many more--O--O--O--O--O--O--O--O Cardiff
>
> All the rebase master's are taking an age (and involve many
> conflicts). They are taking linger than the development.
>
> So this solution is NOT working for maintaining parallel versions.
I like the train track guide. My suggestion would be to take a step
back and consider what your requirements are.
‘git rebase’ was designed to support a workflow in which individuals
are responsible for short patch series (up to 10 patches, say) that
have not been reviewed and accepted yet. To save reviewers the
trouble of placing themselves in a mindset of the past, the patch
submitter occasionally “refreshes” the patches to fit an appropriately
modern codebase.
With this comes a downside: if the patch submitter immediately sends
the patches after doing this (bad submitter!), they are sending
untested code. Furthermore, they make it very hard for /other people/
to develop code on top of their constantly shifting code. So when
a patch series grows long enough that a simple read-through would be
unfeasible anyway, rebasing can be a very bad idea.
You may also be interested in
http://thread.gmane.org/gmane.comp.video.dri.devel/34739/focus=34744
Good luck,
Jonathan
next prev parent reply other threads:[~2010-07-21 17:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-21 15:28 Handling multiple parallel versions Ian Hobson
2010-07-21 16:59 ` Jonathan Nieder [this message]
2010-07-21 17:09 ` Jonathan Nieder
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=20100721165952.GA14144@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=ian@ianhobson.co.uk \
/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;
as well as URLs for NNTP newsgroup(s).