Re: branch management

From: Alex Riesen <raa.lkml@gmail.com>
Date: Jun 9, 2009, 19:50 UTC
Message-ID: <20090609195018.GA17848@blimp.localdomain>
In-Reply-To: <08614AC584A6ED42BD836DE9286376E12A211FA9CA@spswchi6mail1.peak6.net>

Harry Duin, Tue, Jun 09, 2009 19:35:24 +0200:

> My questions are on branch management.

You seem to think about branches as they are in CVS or SVN (just directories with in-system metadata). You'll find the Git's branching different (being more about history, not at all about directory structure).

Show 6 quoted lines

> 1. We have different repos for doing the integration merging. In
> addition to that we have a golden repos, containing what is in
> production. The branch history gets pushed by developers to the
> integration repos, but not to the golden repos. Since our integration
> repos are created for each integration, this means I have lost my
> branch history when an integration repos gets deleted..

No. As long as there is something, basing its history on the history of the integration repos (and I assume that your "golden", aka "release" or "maintenance" elsewhere, do just that) the history is there. Forever. As it is on every developers machine with a distributed VCS.

> 2. What command do I use to display only the list of files updated by/for a
> branch?

Do you mean the files changed since the branch (presumably "development") diverged from some other branch (presumably "golden")? What for?

> This means I want to exclude files that were merged in from say
> master - these files are not part of the branch development.

You better not exclude files (and while at it, stop thinking about files when working with _history_).

Try describing the problem on _change_ (aka "commit", or point in time or history) level.

P.S. Your (re?)mailer seems to be broken. This mail is not very correct base64 and gmail does not even decode it.