On Jun 29, 2012, at 6:36 PM, Petr Bena wrote:
On Fri, Jun 29, 2012 at 4:22 PM, Antoine Musso
<hashar+wmf(a)free.fr> wrote:
>
> Timo proposed a system where we would have a common configuration
> directory, and one for production and another one for labs. Much like how
> /etc/php5/ is organized on Debian systems:
>
> /etc/php5/conf.d/ <-- common conf
> /etc/php5/apache2 <-- conf while running under web server
> /etc/php5/cli <-- conf for CLI scripts
>
> Then each directory contains an ini file per extension.
>
But that's a lot of hand work, if we really do
this, we won't use
gerrit at all, we just copy paste code from diffs by hand and insert
it to some extra files. I would rather volunteer to sync branches
rather than this creep work.
Misunderstanding :)
This directory structure would be inside the repository, not locally.
So no hard word or manual diffing and stuff.
-- Krinkle
On Jun 29, 2012, at 6:55 PM, Rob Lanphier wrote:
Petr, I'm a little alarmed by this statement:
"we need to merge stuff
by hand". What do you mean by "merging by hand", and what sorts of
things are you merging?
Rob