[Nix-dev] Working on multiple modules on multiple branches - single server

[Bryan Gardiner]

Perhaps you don't want to do this, but if you want some set of
branches to always be active and current on your boxes, just keep a
temporary integration branch that you merge other changes into, then
you can automate pushing that branch to your machines
(clone+checkout+rsync, or stash+checkout+rsync).  Could even automate
the merges as long as there are no conflicts.

Or, keep an integration branch for each setup you want.  Branch
management for the win :).

- Bryan


On Thu, Jul 30, 2015 at 07:59:44AM +0200, Christian Theune wrote:
> Hi,
> 
> I’m working on a few things for my home server at the moment (Sensu for monitoring, Netatalk for TimeMachine) and I just started splitting my work into multiple branches so that I can submit the pieces individually.
> 
> However, no I experience some pain while developing as I’m rebuilding the system from various branches all the time (editing locally, rsyncing the whole thing to the machine, then running nixos-rebuild -I …) which turns out will always disable my other work …
> 
> Is there an obvious solution to this that I’m missing? Complicated git branch management?
> 
> Cheers,
> Christian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 801 bytes
Desc: Digital signature
Url : http://lists.science.uu.nl/pipermail/nix-dev/attachments/20150730/8aac3886/attachment-0001.bin