Re: Please review this pull request for maint branch with update of de.po

From: Junio C Hamano <gitster@pobox.com>
Date: May 8, 2012, 02:24 UTC
Message-ID: <7vtxzr1kbd.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CANYiYbFiwvy8Lw+XQTehbc3k2FukrvhCvR6urfAR_3xVqXxNZA@mail.gmail.com>

Jiang Xin <worldhello.net@gmail.com> writes:

Show 5 quoted lines

> Hi Junio and members of German l10n team,
>
> Ralf send me two pull requests with improvement of Git German translation.
> All look fine except that one commit (fbd994d) by Thomas hacks a file
> "git-gui/po/de.po", which is outside of "po/" directory.

Sorry, but I cannot take this tree for two reasons:

 - If the state of the tree needs to be confirmed by l10n team, and it is
   possible that you need to cancel this pull request based on their
   feedback, I cannot pull it from you right now; otherwise your corrected
   history won't fast-forward anymore.  So the message should either be
   "Please make sure I have what l10n teams wanted to send out" to them,
   or "I am confident that l10n teams are happy with this, please pull" to
   me, but cannot be both.

 - git-gui/ part of my tree is maintained without the rest of git.git/
   tree by Pat Thoyts, and an update needs to go through that tree. I
   cannot take a change directly to that part.  Doing so would make
   it impossible to update git-gui/ project independently.

Please redo your tree by having the originating author separate the git-gui part out, make sure everybody on the l10n team is happy with the result, and then throw me another pull request. Also arrange the git-gui patch to go through Pat.

By the way, a change to the 'master' track is exactly the same deal, but I would suspect that typically you would want your pull request for 'master' a superset of your 'maint', so please hold off throwing a pull request for 'master' while it still is possible that you might need to rewind and rebuild your 'maint'.

Thanks.