Re: Managing multiple branches in git

From: "Joshua D(dot) Drake" <jd(at)commandprompt(dot)com>
To: Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>
Cc: Andres Freund <andres(at)anarazel(dot)de>, "David E(dot) Wheeler" <david(at)kineticode(dot)com>, Andrew Dunstan <andrew(at)dunslane(dot)net>, Robert Haas <robertmhaas(at)gmail(dot)com>, Alvaro Herrera <alvherre(at)commandprompt(dot)com>, Mark Mielke <mark(at)mark(dot)mielke(dot)cc>, "pgsql-hackers(at)postgresql(dot)org" <pgsql-hackers(at)postgresql(dot)org>
Subject: Re: Managing multiple branches in git
Date: 2009-06-03 00:24:21
Message-ID: 1243988661.9791.0.camel@jd-laptop.pragmaticzealot.org
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-hackers

On Tue, 2009-06-02 at 20:01 -0400, Tom Lane wrote:
> Andres Freund <andres(at)anarazel(dot)de> writes:
> > On 06/03/2009 01:39 AM, Tom Lane wrote:
> >> But rebuilding the Linux kernel is hardly a zero-cost operation,
> >> so how have Linus and co failed to notice this problem? There
> >> must be some trick they're using that I haven't heard about, or
> >> they'd not be nearly so pleased with git.
>
> > Building out of tree and ccache are frequently mentioned.
>
> Yeah, I thought about building out of tree, with a different build tree
> for each branch and VPATH pointing at the common source tree (working
> copy). That would probably work if it weren't that switching to branch
> B and then back to branch A has to advance the filesystem timestamps on
> every file that's different between the two branches. So it would
> defeat whatever intelligence "make" might have. Even if ccache is not
> fooled, that's only a very partial solution.

So I bounced on #git and got this:

(05:22:52 PM) mugwump: linuxpoet: great. So, anyway, for that particular
problem you have two possible solutions: git-new-workdir (crack it open,
it's very simple!), or using multiple clones with hooks that copy
revisions between each other when they are committed

The "particular" problem he is referring to is:

http://archives.postgresql.org/pgsql-hackers/2009-06/msg00221.php
http://archives.postgresql.org/pgsql-hackers/2009-06/msg00221.php
http://archives.postgresql.org/pgsql-hackers/2009-06/msg00202.php

Sincerely,

Joshua D. Drake

>
> regards, tom lane
>
--
PostgreSQL - XMPP: jdrake(at)jabber(dot)postgresql(dot)org
Consulting, Development, Support, Training
503-667-4564 - http://www.commandprompt.com/
The PostgreSQL Company, serving since 1997

In response to

Browse pgsql-hackers by date

  From Date Subject
Next Message Josh Berkus 2009-06-03 00:26:23 Re: It's June 1; do you know where your release is?
Previous Message Tom Lane 2009-06-03 00:01:32 Re: Managing multiple branches in git