Re: Managing multiple branches in git

From: Ron Mayer <rm_pg(at)cheapcomplexdevices(dot)com>
To: Robert Haas <robertmhaas(at)gmail(dot)com>
Cc: Alvaro Herrera <alvherre(at)commandprompt(dot)com>, Mark Mielke <mark(at)mark(dot)mielke(dot)cc>, Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>, "David E(dot) Wheeler" <david(at)kineticode(dot)com>, pgsql-hackers(at)postgresql(dot)org
Subject: Re: Managing multiple branches in git
Date: 2009-06-02 21:28:22
Message-ID: 4A259976.8050909@cheapcomplexdevices.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-hackers

Robert Haas wrote:
> And, unfortunately, I'm not sure there's a good solution. Tom could
> create 1 local repository cloned from the origin and then N-1 copies
> cloned with --local from that one, but this sort of defeats the
> purpose of using git, because now if he commits a change to one of
> them and then wants to apply that change to each back branch, he's got
> to fetch that change on each one, cherry-pick it, make his changes,
> commit, and then push it back to his main repository. Some of this

Why has he got to do this pushing back to his main? How about

creating 1 local repository from Origin,
create N-1 cloned with --local from that one
for each of those "--local" ones, "git-remote add" the main origin

From then ISTM his workflow is very similar to the way he does with CVS,
pulling and pushing from those multiple repositories to the central
origin. He can creating the patches/diffs to apply to each the same
way he does today.

ISTM he'd mostly be unaware that these repositories were ever connected
in some way unless he inspected that some of the files in .git had the
same inodes because they came from hard links.

In response to

Responses

Browse pgsql-hackers by date

  From Date Subject
Next Message Tom Lane 2009-06-02 21:31:44 Re: Managing multiple branches in git
Previous Message Andrew Dunstan 2009-06-02 21:24:45 Re: Managing multiple branches in git