Re: Git conversion status

From: Aidan Van Dyk <aidan(at)highrise(dot)ca>
To: Alvaro Herrera <alvherre(at)commandprompt(dot)com>
Cc: Robert Haas <robertmhaas(at)gmail(dot)com>, Magnus Hagander <magnus(at)hagander(dot)net>, PostgreSQL-development <pgsql-hackers(at)postgresql(dot)org>, Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>
Subject: Re: Git conversion status
Date: 2010-09-22 20:20:15
Message-ID: AANLkTinATE+ZEen-Ckm+8Vwdc6G4c7KyV66-sK4EU0zF@mail.gmail.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-hackers

On Wed, Sep 22, 2010 at 4:04 PM, Alvaro Herrera
<alvherre(at)commandprompt(dot)com> wrote:

> As far as I can see, I need to go to the master clone, run a checkout
> and pull on each branch, and *then* a pull on the local clone updates to
> the latest head on that branch.  It is not enough to pull when the
> master branch is checked out.

What I think has happened is that you have a master clone, and you've
cloned *that* to your "working" repositories, right?

And you "pull" in your master repository, and that updates the
*remote* tracking branches. But it doesn't automatically "merge" (or
what you want, replace) the *local* branches of the master repository.
Until you do so.

I think what you want in this case (where you have a local "master"
repositroy, and clone your work of them) is to make your master
repository just be a bare mirror repo, not a
full-fledged-with-working-directory repository. If it's just a mirror
of the remote, it doesn't have the distinction between "remote"
branches and "local" branches, and your local working clones of it
will see exactly what it's fetched from the remote.

In response to

Responses

Browse pgsql-hackers by date

  From Date Subject
Next Message Josh Berkus 2010-09-22 20:20:19 Re: Another Modest Proposal: Platforms
Previous Message David Fetter 2010-09-22 20:17:54 Another Modest Proposal: Platforms