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.
On Fri, Jun 29, 2012 at 4:22 PM, Antoine Musso <hashar+wmf(a)free.fr> wrote:
Petr Bena wrote:
Can we create a new branch which would be
speedily merged when changes
were done to it, so that we could check out on labs and apply the
change there in order to test if patches submitted by devs works ok?
Thanks to Antoine we use the same repository on beta project, but
right now it's really hard to test stuff submitted to gerrit because
we need to merge stuff by hand.
I will really prefer we avoid using a test branch. That is mainly based
out of the experience of operations/puppet.git and I am not volunteering
to maintain them in sync (will do if the community wants though).
The current way is to put labs stuff in the -wmflabs.php files. We might
want to rewrite our actual system to avoid the multiple conditional
statement which are cluetering the files and just have one or two
statement in the entry file (CommonSettings.php).
Timo proposed a system where we would have a common configuration
directory, 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.
Regarding branches, I am fine having people maintain their own branch
which they will be individually responsible for keeping it up to date.
The thing is that Gerrit does not work that way and people are supposed
to send patches. So they can maintain their own fork in a local branch
which can be submitted to Gerrit. Their local branch will become a topic
branch of our master. Then we can review / merge.
--
Antoine "hashar" Musso
_______________________________________________
Wikitech-l mailing list
Wikitech-l(a)lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikitech-l