[+cc Pat]
Junio C Hamano [off-list ref] writes:
- 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.
I suspected something like this might happen, but proposed a
simultaneous change anyway. My bad. Ralf, can you split it or should I
resend?
But for next time, can there be another solution? It seems that this
process will make it very hard in general to keep the git-gui and core
git translations in sync.
--
Thomas Rast
trast@{inf,student}.ethz.ch
I suspected something like this might happen, but proposed a
simultaneous change anyway. My bad. Ralf, can you split it or should I
resend?
Is it ok for you if I remove your change to git-gui completely
from the patch? Perhaps we can sync the translation to
git-gui within a complete new patch (-series). That implies
that Xin and I have to rewrite our history, don't?.
It's pretty much easier to add a new commit which
simply removes the change from git-gui.
Ralf
2012/5/8 Ralf Thielow [off-list ref]:
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