Re: For dpkg translators: new git instructions
Raphael Hertzog: Please understand that this is not useful historical information and as such we'd like to avoid seeing it. We want a single Update Polish translations instead of 10 similar commits. Would doing the incremental updates on a branch and merging it with git merge --squash achieve the same effect, or would that still clutter the repository? -- \\// Peter - http://www.softwolves.pp.se/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: For dpkg translators: new git instructions
On Wed, 10 Oct 2007, Peter Karlsson wrote: Raphael Hertzog: Please understand that this is not useful historical information and as such we'd like to avoid seeing it. We want a single Update Polish translations instead of 10 similar commits. Would doing the incremental updates on a branch and merging it with git merge --squash achieve the same effect, or would that still clutter the repository? I'm not sure I understand correctly the documentation of that option, but it appears to be something completely unrelated. This command seems to apply the changes corresponding to the merge but not record the merge as a merge, thus losing information concerning the changes. It looks like this has the potential to hurt... please don't use it. :) Cheers, -- Raphaël Hertzog Premier livre français sur Debian GNU/Linux : http://www.ouaza.com/livre/admin-debian/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: For dpkg translators: new git instructions
Peter Karlsson [EMAIL PROTECTED] writes: Raphael Hertzog: Please understand that this is not useful historical information and as such we'd like to avoid seeing it. We want a single Update Polish translations instead of 10 similar commits. Would doing the incremental updates on a branch and merging it with git merge --squash achieve the same effect, or would that still clutter the repository? Yes, it does exacly the same thing. -- O T A V I OS A L V A D O R - E-mail: [EMAIL PROTECTED] UIN: 5906116 GNU/Linux User: 239058 GPG ID: 49A5F855 Home Page: http://otavio.ossystems.com.br - Microsoft sells you Windows ... Linux gives you the whole house. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: For dpkg translators: new git instructions
Raphael Hertzog [EMAIL PROTECTED] writes: On Wed, 10 Oct 2007, Peter Karlsson wrote: Raphael Hertzog: Please understand that this is not useful historical information and as such we'd like to avoid seeing it. We want a single Update Polish translations instead of 10 similar commits. Would doing the incremental updates on a branch and merging it with git merge --squash achieve the same effect, or would that still clutter the repository? I'm not sure I understand correctly the documentation of that option, but it appears to be something completely unrelated. This command seems to apply the changes corresponding to the merge but not record the merge as a merge, thus losing information concerning the changes. It looks like this has the potential to hurt... please don't use it. :) Sorry but you missunderstood it. For example, say branches: master foo and I've been commiting on foo for a while. Once my change is done, I can go to master and run: git merge --squash foo. It'll basically do the merge but no commits. When you commit, it'll show all the commit log of previous commits and you can change it and use a nice commit message that will look like if everything has been done on a single commit. This is one way of using topic branches and is similar to the squash command on rebase -i. -- O T A V I OS A L V A D O R - E-mail: [EMAIL PROTECTED] UIN: 5906116 GNU/Linux User: 239058 GPG ID: 49A5F855 Home Page: http://otavio.ossystems.com.br - Microsoft sells you Windows ... Linux gives you the whole house. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: For dpkg translators: new git instructions
On Wed, 10 Oct 2007, Otavio Salvador wrote: This command seems to apply the changes corresponding to the merge but not record the merge as a merge, thus losing information concerning the changes. It looks like this has the potential to hurt... please don't use it. :) Sorry but you missunderstood it. No I didn't. You misunderstood how translators are merging. :-) For example, say branches: master foo and I've been commiting on foo for a while. Once my change is done, I can go to master and run: git merge --squash foo. Indeed. But the translators don't work on their dedicated branches and generally do not use (or even do not want to know) what a topic branch is. Cheers, -- Raphaël Hertzog Premier livre français sur Debian GNU/Linux : http://www.ouaza.com/livre/admin-debian/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: For dpkg translators: new git instructions
On Wed, 10 Oct 2007, Otavio Salvador wrote: Peter Karlsson [EMAIL PROTECTED] writes: Raphael Hertzog: Please understand that this is not useful historical information and as such we'd like to avoid seeing it. We want a single Update Polish translations instead of 10 similar commits. Would doing the incremental updates on a branch and merging it with git merge --squash achieve the same effect, or would that still clutter the repository? Yes, it does exacly the same thing. Please explain your answer if you're going to be affirmative so quickly. Because it really depends on the workflow. We're speaking of translators here, you can't expect them to figure out the details alone. They usually do their translation in their local master branch and pull/merge from origin/master. Doing git merge --squash origin/master will create serious troubles IMO. However, if they do their translations in a local branch mytranslation and then move to the master branch and use git merge --squash mytranslation then it's most probably ok, because they reduce the several unmerged commits to uncommited changes in the master branch that are now ready to commit. But then they must wipe out their mytranslation branch and start over (or rebase it or whatever). But I think that this is not a sustainable workflow for translators. They are not used to handle multiple branches and it's complicated enough already. Cheers, -- Raphaël Hertzog Premier livre français sur Debian GNU/Linux : http://www.ouaza.com/livre/admin-debian/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: For dpkg translators: new git instructions
On Wed, 10 Oct 2007, Otavio Salvador wrote: Peter Karlsson [EMAIL PROTECTED] writes: Would doing the incremental updates on a branch and merging it with git merge --squash achieve the same effect, or would that still clutter the repository? Peter looks to use this workflow and on this case it works. I'm replying _his_ question. Right, sorry, I read Peter's email too quickly. I skipped the incremental updates on a branch... Cheers, -- Raphaël Hertzog Premier livre français sur Debian GNU/Linux : http://www.ouaza.com/livre/admin-debian/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
For dpkg translators: new git instructions
Hello dear translators, we have updated the instructions on the Git usage that we expect you to do: see http://wiki.debian.org/Teams/Dpkg/GitUsage The short summary is: 1/ Don't use git pull but use instead git fetch git rebase origin/master (this is to avoid seeing many merge commits which do not add any value, see below for an example) 2/ Don't multiply local commits uselessly. If you have several commits to push please use git rebase -i origin/master to merge them in a single one. This command displays a list of pending commits of you, each on a single line starting with pick. Keep the pick on the first line but replace all other occurences of pick by squash. Save and exit the editor. Enter a new log message for the single commit that will replace the previous serie of commits. The wiki page has a more concrete example of usage. Basically we have seen a few push like this: bb55e03 Update Polish translations. 3dc3d8e Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg ea5926f Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg 84556e3 Update to 322t69f71u 4e85e21 Update to 1165t23f110u 229afa4 Initial Polish translation of scripts - 100t185f177u 9386ce0 Updated to 1125t32f141u be0f3cb Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg 3513003 Updated to 1098t27f160u bac2e4e Update Polish translation to 1071t24f190u (I took Robert as example, but others are doing the same. I don't blame anyone, you couldn't know... but now we'll try to improve the situation a bit) Please understand that this is not useful historical information and as such we'd like to avoid seeing it. We want a single Update Polish translations instead of 10 similar commits. Thanks for your help and if you have questions, feel free to ask. Cheers, -- Raphaël Hertzog Premier livre français sur Debian GNU/Linux : http://www.ouaza.com/livre/admin-debian/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
