{"thread":{"id":"30463","subject":"Please review this pull request for maint branch with update of de.po","startedAt":"2012-05-08T00:30:48Z","lastAt":"2012-05-11T22:28:11Z","messageCount":10,"participants":["Jiang Xin","Junio C Hamano","Thomas Rast","Ralf Thielow"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"191060","messageId":"CANYiYbFiwvy8Lw+XQTehbc3k2FukrvhCvR6urfAR_3xVqXxNZA@mail.gmail.com","threadId":"30463","inReplyTo":"CANYiYbFf73hVen2sg1viNrXxt-g+tP=bF_ryBF8JYp0ZAL0b6A@mail.gmail.com","subject":"Please review this pull request for maint branch with update of de.po","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2012-05-08T00:30:48Z","receivedAt":"2012-05-08T00:30:48Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"Hi Junio and members of German l10n team,\n\nRalf send me two pull requests with improvement of Git German translation.\nAll look fine except that one commit (fbd994d) by Thomas hacks a file\n\"git-gui/po/de.po\", which is outside of \"po/\" directory.\n\nThe following changes since commit bf505158d0292eed441fff1bc9157da19645ee91:\n\n Git 1.7.10.1 (2012-05-01 21:18:44 -0700)\n\nare available in the git repository at:\n\n https://github.com/git-l10n/git-po/ maint\n\nfor you to fetch changes up to c7e01d305fd50a216d990fcaf03da66a803a69df:\n\n Merge branch 'ralfth/git-po-de/maint' into maint (2012-05-08 06:20:33 +0800)\n\n----------------------------------------------------------------\n\nJiang Xin (1):\n     Merge branch 'ralfth/git-po-de/maint' into maint\n\nRalf Thielow (5):\n     l10n: add new members to German translation team\n     l10n: de.po: translate \"track\" as \"beobachten\"\n     l10n: de.po: translate \"remote\" as \"extern\"\n     l10n: de.po: collection of improvements\n     l10n: de.po: unify translation of \"ahead\" and \"behind\"\n\nThomas Rast (4):\n     de.po: translate \"bare\" as \"bloß\"\n     de.po: hopefully uncontroversial fixes\n     de.po: translate \"bad\" as \"ungültig\" (\"invalid\")\n     de.po: collection of suggestions\n\n git-gui/po/de.po |    2 +-\n po/TEAMS         |    3 +\n po/de.po         |  452 +++++++++++++++++++++++++++---------------------------\n 3 files changed, 226 insertions(+), 231 deletions(-)\n\n--\nJiang Xin\n\n\n-- \n蒋鑫\n\n北京群英汇信息技术有限公司\n邮件: worldhello.net@gmail.com\n网址: http://www.ossxp.com/\n博客: http://www.worldhello.net/\n微博: http://weibo.com/gotgit/\n电话: 010-51262007, 18601196889\n"},{"id":"191062","messageId":"7vtxzr1kbd.fsf@alter.siamese.dyndns.org","threadId":"30463","inReplyTo":"CANYiYbFiwvy8Lw+XQTehbc3k2FukrvhCvR6urfAR_3xVqXxNZA@mail.gmail.com","subject":"Re: Please review this pull request for maint branch with update of de.po","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-05-08T02:24:38Z","receivedAt":"2012-05-08T02:24:38Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jiang Xin writes:\n\n> Hi Junio and members of German l10n team,\n>\n> Ralf send me two pull requests with improvement of Git German translation.\n> All look fine except that one commit (fbd994d) by Thomas hacks a file\n> \"git-gui/po/de.po\", which is outside of \"po/\" directory.\n\nSorry, but I cannot take this tree for two reasons:\n\n - If the state of the tree needs to be confirmed by l10n team, and it is\n possible that you need to cancel this pull request based on their\n feedback, I cannot pull it from you right now; otherwise your corrected\n history won't fast-forward anymore. So the message should either be\n \"Please make sure I have what l10n teams wanted to send out\" to them,\n or \"I am confident that l10n teams are happy with this, please pull\" to\n me, but cannot be both.\n\n - git-gui/ part of my tree is maintained without the rest of git.git/\n tree by Pat Thoyts, and an update needs to go through that tree. I\n cannot take a change directly to that part. Doing so would make\n it impossible to update git-gui/ project independently.\n\nPlease redo your tree by having the originating author separate the\ngit-gui part out, make sure everybody on the l10n team is happy with the\nresult, and then throw me another pull request. Also arrange the git-gui\npatch to go through Pat.\n\nBy the way, a change to the 'master' track is exactly the same deal, but\nI would suspect that typically you would want your pull request for 'master'\na superset of your 'maint', so please hold off throwing a pull request for\n'master' while it still is possible that you might need to rewind and\nrebuild your 'maint'.\n\nThanks.\n"},{"id":"191072","messageId":"87ipg75drv.fsf@thomas.inf.ethz.ch","threadId":"30463","inReplyTo":"7vtxzr1kbd.fsf@alter.siamese.dyndns.org","subject":"Re: Please review this pull request for maint branch with update of de.po","fromName":"Thomas Rast","fromEmail":"trast@inf.ethz.ch","sentAt":"2012-05-08T07:32:20Z","receivedAt":"2012-05-08T07:32:20Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"[+cc Pat]\n\nJunio C Hamano writes:\n\n> - git-gui/ part of my tree is maintained without the rest of git.git/\n> tree by Pat Thoyts, and an update needs to go through that tree. I\n> cannot take a change directly to that part. Doing so would make\n> it impossible to update git-gui/ project independently.\n>\n> Please redo your tree by having the originating author separate the\n> git-gui part out, make sure everybody on the l10n team is happy with the\n> result, and then throw me another pull request. Also arrange the git-gui\n> patch to go through Pat.\n\nI suspected something like this might happen, but proposed a\nsimultaneous change anyway. My bad. Ralf, can you split it or should I\nresend?\n\nBut for next time, can there be another solution? It seems that this\nprocess will make it very hard in general to keep the git-gui and core\ngit translations in sync.\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"191073","messageId":"CAN0XMOLeUxTgLw2KEJDJt8x6ebtJE2en-ChY3x=fbQdrH44COg@mail.gmail.com","threadId":"30463","inReplyTo":"87ipg75drv.fsf@thomas.inf.ethz.ch","subject":"Re: Please review this pull request for maint branch with update of de.po","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@googlemail.com","sentAt":"2012-05-08T07:48:08Z","receivedAt":"2012-05-08T07:48:08Z","isPatch":false,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"> I suspected something like this might happen, but proposed a\n> simultaneous change anyway.  My bad.  Ralf, can you split it or should I\n> resend?\n\nIs it ok for you if I remove your change to git-gui completely\nfrom the patch? Perhaps we can sync the translation to\ngit-gui within a complete new patch (-series). That implies\nthat Xin and I have to rewrite our history, don't?.\nIt's pretty much easier to add a new commit which\nsimply removes the change from git-gui.\n\nRalf\n"},{"id":"191077","messageId":"CANYiYbGOrev6Frr7997gp_V7kj1jJP7HA=GGFYbeJ1RBL7E0yQ@mail.gmail.com","threadId":"30463","inReplyTo":"CAN0XMOLeUxTgLw2KEJDJt8x6ebtJE2en-ChY3x=fbQdrH44COg@mail.gmail.com","subject":"Re: Please review this pull request for maint branch with update of de.po","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2012-05-08T09:20:52Z","receivedAt":"2012-05-08T09:20:52Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2012/5/8 Ralf Thielow :\n> git-gui within a complete new patch (-series). That implies\n> that Xin and I have to rewrite our history, don't?.\n\nHistory of both master and maint branch of git-po has been\nrewritten, and new git.pot is generated for both maint and\nmaster branch. I see the tip commit of git.git maint branch is\n\"Start preparing for 1.7.10.2\", and there is 1 new message,\nso maybe no futher git.pot update for 1.7.10.2.\n\n> It's pretty much easier to add a new commit which\n> simply removes the change from git-gui.\n\nMaybe you can work like this:\n\nFirst, remove hacks on git-gui by a interactive rebase.\n\n1. Start a interactive rebase against parent commit of fbd994d.\n\n $ git rebase -i fbd994d^\n\n2. In the editor, change command for commit fbd994d\n from pick to edit; save and quit the edit.\n\n3. The rebase process will stop at commit fbd994d.\n Revert hacks on \"git-gui/po/de.po\" by a checkout:\n\n $ git checkout HEAD^ -- git-gui/po/de.po\n\n4. Amend your commit.\n\n $ git commit --amend\n\n5. Continue the interactive rebase.\n\n $ git rebase --continue\n\nSecond, fetch the new maint branch from git-l10n/git-po\nand do a rebase or merge. I prefer rebase, because\nyou won't have to write a merge commit log. ;-)\n\n $ git fetch https://github.com/git-l10n/git-po.git maint\n $ git rebase FETCH_HEAD\n\nThen msgmerge git.pot to de.po, and translate 1 new message.\n\nNo forget reset your master branch completely before\nmerge the maint branch.\n\n-- \nJiang Xin\n"},{"id":"191410","messageId":"7vipg2le0u.fsf@alter.siamese.dyndns.org","threadId":"30463","inReplyTo":"87ipg75drv.fsf@thomas.inf.ethz.ch","subject":"Re: Please review this pull request for maint branch with update of de.po","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-05-11T19:21:37Z","receivedAt":"2012-05-11T19:21:37Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Rast writes:\n\n> But for next time, can there be another solution? It seems that this\n> process will make it very hard in general to keep the git-gui and core\n> git translations in sync.\n\nThat unfortunately is fundamental in the way git-gui and the core git are\nrelated to each other, and the story is the same for gitk.\n\nThe arrangement to pull only in one direction comes from the initial\ndesire from the maintainers of these \"merge -s subtree\" merged projects.\nThese source trees are designed to be usable without being embedded inside\na source tree of the core git, and when people want to work only on one of\nthese projects, their clone will not have to carry any material from the\nhistory of the git core side. The git core side didn't _have_ to have\nthem as part of its tree, but because it makes distribution to end users\nmore convenient, and that was the reason why we have these as part of our\ntree.\n\nTheoretically, we could ignore the wish of git-gui/gitk projects and apply\npatches that touch these two parts directly to the git core tree, and let\nthe maintainers of these projects deal with the consequences. They can\ncherry-pick only a part of your commit from the git core tree to their\ntrees while still retaining their independence, for example, and my next\nmerge from them will see \"both sides added identically or made identical\nchanges\", which is not a huge deal. But that adds burden to integrators,\nwhich is not a scalable solution when contributors can make the burden\nsmaller.\n\nThe downside is of course the two projects won't be synchronised, but that\nis inherent---the contained projects do *not* want to be synchronised in\nthe first place. The price these projects pay is that they cannot affect\nwhat is outside of their trees (e.g. they cannot add test scripts to our\nside to test the new feature in their new tree).\n\nAnother downside, once \"merge -s subtree\" is made, is that tracking\nchanges in such a semi-subproject in the context of the containing project\nbecomes harder, as we will continuously seeing what is essentially a\nrenaming merge. But it still is manageable as long as the merge is in one\ndirection only. When inspecting the history of the contained project, you\nonly need to find the last such merge to the containing project, and then\nfollow the history of its second parent, whose history will _not_ contain\nanything from the containing project.\n\nThe recent contrib/subtree merge (not to be confused with \"merge -s\nsubtree\") follows quite an opposite approach from what was used for\ngit-gui/gitk. It decided to cease to be an independent project to\neventually integrate it as a part of the core, and further development of\nit will happen in the context of the layout of having the top of the last\nof its tree at contrib/subtree. Because it has involved a merge in the\n\"merge -s subtree\" style once, it is harder to track its history beyond\nthat point, but by being the part of the larger tree from now on, we only\nhave to suffer once---it is inconvenient to inspect the history before the\nmerge, but that is a one-time transition pain.\n\nIncidentally, that is why I would be _very_ reluctant to take further\nmerges for contrib/subtree if the merged history contain \"git subtree\"\nmerges that ran \"merge -s subtree\" in both ways. It makes what is\nsupposedly just a one-time transition pain to continuous one.\n"},{"id":"191411","messageId":"CAN0XMOKi7PMLC0fSpT3n1+fYL_Uop1XGiTi_BJCRuxPRRknd7Q@mail.gmail.com","threadId":"30463","inReplyTo":"7vipg2le0u.fsf@alter.siamese.dyndns.org","subject":"Re: Please review this pull request for maint branch with update of de.po","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@googlemail.com","sentAt":"2012-05-11T19:37:13Z","receivedAt":"2012-05-11T19:37:13Z","isPatch":false,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"What about a README file like \"/po\" has?\n"},{"id":"191412","messageId":"7vehqqld4w.fsf@alter.siamese.dyndns.org","threadId":"30463","inReplyTo":"CAN0XMOKi7PMLC0fSpT3n1+fYL_Uop1XGiTi_BJCRuxPRRknd7Q@mail.gmail.com","subject":"Re: Please review this pull request for maint branch with update of de.po","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-05-11T19:40:47Z","receivedAt":"2012-05-11T19:40:47Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Thielow writes:\n\n> What about a README file like \"/po\" has?\n\nSorry, but I cannot tell what you want to know about it.\n"},{"id":"191413","messageId":"CAN0XMOJLrGcB3=jy09b57FPc=ZoRxmo1Gx09vOLoxPexEe5fiQ@mail.gmail.com","threadId":"30463","inReplyTo":"7vehqqld4w.fsf@alter.siamese.dyndns.org","subject":"Re: Please review this pull request for maint branch with update of de.po","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@googlemail.com","sentAt":"2012-05-11T19:50:41Z","receivedAt":"2012-05-11T19:50:41Z","isPatch":false,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"On Fri, May 11, 2012 at 9:40 PM, Junio C Hamano wrote:\n> Ralf Thielow writes:\n>\n>> What about a README file like \"/po\" has?\n>\n> Sorry, but I cannot tell what you want to know about it.\n>\n\nThis was just an idea to do it in the same way.\nWhat I want to say is that there is a README file in the po folder which\ntelling people that if they want to change something here, they have\nto go through\nthe git.l10n repo to get changes into the git-core repo.\nThat's presumably the same situation here, isn't it?\nJust an idea.\n"},{"id":"191422","messageId":"7vr4uqjqtg.fsf@alter.siamese.dyndns.org","threadId":"30463","inReplyTo":"CAN0XMOJLrGcB3=jy09b57FPc=ZoRxmo1Gx09vOLoxPexEe5fiQ@mail.gmail.com","subject":"Re: Please review this pull request for maint branch with update of de.po","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-05-11T22:28:11Z","receivedAt":"2012-05-11T22:28:11Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Thielow writes:\n\n> On Fri, May 11, 2012 at 9:40 PM, Junio C Hamano wrote:\n>> Ralf Thielow writes:\n>>\n>>> What about a README file like \"/po\" has?\n>>\n>> Sorry, but I cannot tell what you want to know about it.\n>\n> This was just an idea to do it in the same way.\n> What I want to say is that there is a README file in the po folder which\n> telling people that if they want to change something here, they have\n> to go through\n> the git.l10n repo to get changes into the git-core repo.\n> That's presumably the same situation here, isn't it?\n\nHmph. I thought we had something that was meant for contributors in\nDocumentation/SubmittingPatches, but apparently we don't.\n"}]}