[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Auto-merging translations and master
From: |
David Kastrup |
Subject: |
Re: Auto-merging translations and master |
Date: |
Tue, 05 Jun 2012 11:16:33 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) |
John Mandereau <address@hidden> writes:
> Hello,
>
> Now that I have looked at the scripts for building staging and merging
> it into master, upgraded my Fedora installation, a cron job runs this
> every two hours on my computer in the lab, and sends an email
> notification only if something fails or when a build is done. How about
> adding merging with translation? I propose that when staging builds
> succesfully, it should be merged into master and translation, then a
> build of translation is attempted, and if it succeeds translation is
> merged into master.
>
> What do you think of this?
The only automatic merges that are actually safe to do are
fast-forwards, and the translation merges are not of that kind.
--
David Kastrup
Re: Auto-merging translations and master, Graham Percival, 2012/06/05
Re: Auto-merging translations and master, Han-Wen Nienhuys, 2012/06/05