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

2015-07-30 Thread Christian Theune
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

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

2015-07-30 Thread 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

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

2015-07-30 Thread Christian Theune
On 30 Jul 2015, at 09:27, Vladimír Čunát vcu...@gmail.com wrote: On 07/30/2015 07:59 AM, Christian Theune wrote: 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,

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

2015-07-30 Thread Vladimír Čunát
On 07/30/2015 09:27 AM, Christian Theune wrote: It’s basically just for remote editing. Right, so I guess the point is how to develop the features on separate branches but still use them together comfortably? As suggested, topgit is a nice tool for that, especially when some features depend on

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

2015-07-30 Thread Christian Theune
On 30 Jul 2015, at 09:38, Vladimír Čunát vcu...@gmail.com wrote: On 07/30/2015 09:27 AM, Christian Theune wrote: It’s basically just for remote editing. Right, so I guess the point is how to develop the features on separate branches but still use them together comfortably? As suggested,

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

2015-07-30 Thread Christian Theune
Hi, On 30 Jul 2015, at 08:57, Joel Moberg joel.mob...@gmail.com wrote: You could make a virtualbox vm that you use only for development. This should avoid syncing and also let you work offline. And for branch management you could work on a single branch until you are done with all work.

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

2015-07-30 Thread Edward Tjörnhammar
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.

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

2015-07-30 Thread Vladimír Čunát
On 07/30/2015 07:59 AM, Christian Theune wrote: 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

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

2015-07-30 Thread Nicolas Pierron
Hi Christian, On Thu, Jul 30, 2015 at 9:26 AM, Edward Tjörnhammar e...@cflags.cc wrote: 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