Re: Multiple checkouts active for the same repository

From: Gustavo Narea <gnarea@tech.2degreesnetwork.com>
Date: Sep 24, 2010, 14:42 UTC
Message-ID: <4C9CB8C6.1050101@tech.2degreesnetwork.com>
In-Reply-To: <AANLkTikvyM9wXrewRiG7OdBp5LMfnHSkA9dqZGT1Twpc@mail.gmail.com>

Hello,

On 24/09/10 14:07, Ævar Arnfjörð Bjarmason wrote:

Show 6 quoted lines

> On Fri, Sep 24, 2010 at 09:29, Gustavo Narea
> <gnarea@tech.2degreesnetwork.com> wrote:
> 
>> We're currently migrating from another DVCS.
> 
> Which one?

Bazaar.

Show 31 quoted lines

>> We are a team of Web developers and testers working on an application.
>> There are always a few development branches and a stable branch, and
>> testers need all the branches with the very latest code available at all
>> times.
>>
>> The way we handle it at the moment is very simple because the server
>> hosting the remote repository is the same that hosts the deployed
>> instances of each branch, so when we push to the remote repository, the
>> code for each site is automatically updated.
>>
>> We use the following structure:
>> /srv/repositories/project/branch1
>> /srv/repositories/project/branch2
>> /srv/repositories/project/branch3
>>
>> Is there any simple way to do this with Git? I can only think of two
>> options that involve hooks:
>>
>>    * Have a hook that exports each branch to a directory like
>>      /srv/repositories/project/branchN
>>    * Have one Git repository per branch, so that each repository have a
>>      different checkout active. Then the main remote repository will
>>      have post-receive hooks that trigger a pull on each individual
>>
>> I'm not particularly happy with either way. Is there a better solution?
> 
> If you really need this the best solution is to just `git clone` the
> project multiple times and check out each branch in its own dir. Then
> have some shellscript to update them all.
> 
> But just using the Git workflow would be better.

OK, I'll do it that way.

Show 9 quoted lines

>> Apart from the situation I describe in the initial email, there's
>> another limitation in the development environment: Our IDE, Eclipse +
>> Pydev, assumes each project (i.e., branch/checkout) to be on different
>> directories and each project should have different settings (e.g., paths
>> to dependencies, which could be different), but with GIt everything
>> would be a single project because it's all on the same path.
> 
> Can't you just modify your build environment to check the output of
> `git symbolic-ref HEAD` or equivalent, instead of checking paths?

Yes, that's what I intend to do for the build system, but that wouldn't solve the problem with the IDE:

Eclipse and PyDev (Python plugin) store their settings in the project directory. For example, the one from PyDev contains the absolute paths to all the dependencies, which makes features like auto-completion work; I would have to mark these files are ignored because they change from machine to machine, and sometimes from branch to branch.

So, no matter what the active branch is, I will always get the settings for the first branch I configured. And if I change them, all the other branches will be affected.

Any suggestions?

I tried playing with --git-dir and --work-tree, so that I could have the repository in one place and the checkout for each branch on different repositories, but it doesn't seem to be a good solution because we cannot specify the branch in commands like git-status.

Thank you very much.

-- 
Gustavo Narea.
Software Developer.
2degrees, Ltd. <http://dev.2degreesnetwork.com/>.