[PATCH] fewer eventcause shifts
dwmw2 at infradead.org
Tue Dec 4 11:27:35 EST 2007
(the subject line was annoying me; I fixed it)
On Tue, 2007-12-04 at 11:12 -0500, John W. Linville wrote:
> On Tue, Dec 04, 2007 at 03:29:30PM +0000, David Woodhouse wrote:
> > Basically, trees which get rebased aren't suitable for git users to base
> > their work on. It just doesn't work.
> Well I think that is an overstatement, but you are entitled to it... :-)
Well, I am making the distinction between 'git as git' and 'git as quilt
storage'. If you interpret 'git users' to mean those who want the
former, it really isn't much of an overstatement at all.
> Again, I don't have any more libertas patches in queue. So don't
> send any more until you are ready to merge and I don't think there
> will be a serious problem.
> > I'm open to better suggestions, as long as they're not "you are not
> > allowed to use git, except as a primitive way of storing patches". :)
> Keeping a clean patch stack at the top is the only way I know to
> come close to guaranteeing you have mergeable patches. Beyond that,
> I'll work with you the best that I can.
Again you're talking of 'patches'. But if we're using "git as git", then
it isn't about guaranteeing you have mergeable _patches_. It's about
guaranteeing you have a mergeable _tree_.
On Tue, 2007-12-04 at 11:14 -0500, John W. Linville wrote:
> If the new patches come fast enough to guarantee that then I have to
> believe that we can work-out how to merge the new patches on top of
> what I've already sent. So, I would prefer to let the pull request
> I sent today stand.
OK, that's fine, I think. Because if you've actually sent the pull
request, then I can use those _commits_ and those will be the ones which
turn up upstream. Those patches won't get recommitted, cherry-picked,
rebased or otherwise mangled so that they're no longer the same commits
that I'm basing my tree on.
Which branch of yours contains the commits (not patches) which are
actually going upstream? I'll throw away my tree and rebase it on that.
More information about the libertas-dev