Re: Translation commits pushed when rolling a tarball

[Bastien Nocera <hadess hadess net>]

On Thu, 2014-07-31 at 17:24 +0200, Sébastien Wilmet wrote:
> Hi,
>
> At some rare occasions, especially after the string freeze, translation
> commits are pushed when rolling a tarball for making a new release.
> Since the commit for the release should be pushed only when 'make
> distcheck' has succeeded, there can be a push conflict and the
> maintainer have to repeat the process (sometimes several times).
>
> I think it would be nice to send mails on gnome-i18n and gnome-doc-list
> to explain that commits should not be pushed during the release days. If
> a translation or documentation commit is important, the maintainers can
> anyway be contacted on IRC to know if the commit can be pushed.
>
> I think there is no equivalent of 'svn lock' for git, so sending a mail
> is a solution.
>
> Bonus point is to add a warning on l10n.gnome.org, but it is more work.
>
> What do you think? Is it too rare to care about this problem?

It's happened quite a few times for my modules, whether it was due to
translations being pushed between the tarball release, and me trying to
push, or me simply forgetting to update the tree before doing the
release.

My workflow looks something like:
- bump versions, update NEWS and commit this
- run make distcheck, and if it doesn't pass, create one or more new
commits to fix the problem, then running "git rebase -i" to put those
before my version bump commit
- distcheck passes, try to push
- If the push succeeds, it doesn't matter if other commits come
afterwards, as you can tag, branch, etc. based on that commit, not
always the latest one as SVN used to handle
- If the push doesn't succeed, run "git pull -r", run "make distcheck"
and push. If you're particularly cocky, you can run "make dist" and
push, but a broken .po file could get in your way ;)

Cheers