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

From: Jiang Xin <worldhello.net@gmail.com>
Date: May 8, 2012, 09:20 UTC
Message-ID: <CANYiYbGOrev6Frr7997gp_V7kj1jJP7HA=GGFYbeJ1RBL7E0yQ@mail.gmail.com>
In-Reply-To: <CAN0XMOLeUxTgLw2KEJDJt8x6ebtJE2en-ChY3x=fbQdrH44COg@mail.gmail.com>

2012/5/8 Ralf Thielow <ralf.thielow@googlemail.com>:

> git-gui within a complete new patch (-series). That implies
> that Xin and I have to rewrite our history, don't?.

History of both master and maint branch of git-po has been rewritten, and new git.pot is generated for both maint and master branch. I see the tip commit of git.git maint branch is "Start preparing for 1.7.10.2", and there is 1 new message, so maybe no futher git.pot update for 1.7.10.2.

> It's pretty much easier to add a new commit which
> simply removes the change from git-gui.

Maybe you can work like this:

First, remove hacks on git-gui by a interactive rebase.

1. Start a interactive rebase against parent commit of fbd994d.

    $ git rebase -i fbd994d^

2. In the editor, change command for commit fbd994d
    from pick to edit; save and quit the edit.

3. The rebase process will stop at commit fbd994d.
    Revert hacks on "git-gui/po/de.po" by a checkout:

    $ git checkout HEAD^ -- git-gui/po/de.po

4. Amend your commit.

    $ git commit --amend

5. Continue the interactive rebase.

    $ git rebase --continue

Second, fetch the new maint branch from git-l10n/git-po and do a rebase or merge. I prefer rebase, because you won't have to write a merge commit log. ;-)

    $ git fetch https://github.com/git-l10n/git-po.git maint
    $ git rebase FETCH_HEAD

Then msgmerge git.pot to de.po, and translate 1 new message.

No forget reset your master branch completely before merge the maint branch.

-- 
Jiang Xin