Date: prev next · Thread: first prev next last
2015 Archives by date, by thread · List index


On Fri, Jan 30, 2015 at 11:32:20AM +0000, Anthonys Lists wrote:
On 30/01/2015 08:30, Lionel Elie Mamane wrote:

How about the git commit/push is made to*fail*  for the developer
then? Some git commit hook or something. The commit fails unless the
developer has set environment variable
"YES_THIS_IS_AN_IMPORT_FROM_POOTLE=yes" or
"AWARE_OF_TRANSLATION_WORKFLOW=yes".

Isn't this behaviour that git is supposed to detect? If you push a
change, then I push a change, git is supposed to detect that my copy
is "stale" and force a rebase before I can push?

My guess is because the pootle-to-git push is not done as a git
merge, but as 'overwrite what is in the working directory from a fresh
git checkout'.

You have in mind:

 * pootle has a git checkout, and changes by translators are committed
   there.
 * Sometimes, that checkout is pushed.

What I think happens is:

 * Sometimes, someones makes "git pull", then exports the contents of
   pootle to that workdir and then "git commit -a && git push".

-- 
Lionel

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.