Re: What is the git workflow for kdelibs ?
On Saturday 10 November 2012 Alexander Neundorf wrote: community.kde.org feels to me like a completely unorganized heap of random stuff. That's true to some degree, and it's exactly the reason why we crated community.kde.org, because we don't want to put this unorganized stuff, which is only understandable, if you have inside knowledge, to 3rd parties as documentation. Techbase is supposed this organized documentation understandable by 3rd parties, so only the stuff, which fits this should go there. -- Cornelius Schumacher schumac...@kde.org
Re: What is the git workflow for kdelibs ?
On Wednesday 07 November 2012 17:45:19 Alexander Neundorf wrote: On Thursday, November 1, 2012 12:05:51 David Faure wrote: (seems I'm still confused about techbase vs community) The git workflow docs should go to techbase, probably in the git section IMO. At the risk of bikeshedding about the non-important, I think my interpretation was right ;) http://wiki.kde.org says: Techbase.kde.org is the primary place for technical information about KDE targeted at 3rd party developers, ISVs and system administrators. Community.kde.org is the working area for the KDE community. It provides a place for sharing information within the community and coordinating teams. Doesn't this mean how to use git to contribute to kdelibs is part of community.kde.org? Techbase is APIs, env vars for setup, customizing etc. I.e. all the advanced usage of what we ship. But the organizing of how we (the KDE community) work, is community.kde.org. -- David Faure, fa...@kde.org, http://www.davidfaure.fr Working on KDE, in particular KDE Frameworks 5
Re: What is the git workflow for kdelibs ?
On Saturday 10 November 2012, David Faure wrote: On Wednesday 07 November 2012 17:45:19 Alexander Neundorf wrote: On Thursday, November 1, 2012 12:05:51 David Faure wrote: (seems I'm still confused about techbase vs community) The git workflow docs should go to techbase, probably in the git section IMO. At the risk of bikeshedding about the non-important, I think my interpretation was right ;) http://wiki.kde.org says: Techbase.kde.org is the primary place for technical information about KDE targeted at 3rd party developers, ISVs and system administrators. Community.kde.org is the working area for the KDE community. It provides a place for sharing information within the community and coordinating teams. Doesn't this mean how to use git to contribute to kdelibs is part of community.kde.org? community.kde.org feels to me like a completely unorganized heap of random stuff. I wouldn't value the 3rd party aprt that high. Or, IOW, I have put also documentation for KDE developers on techbase... (which are not 3rd party). Alex
Re: What is the git workflow for kdelibs ?
On Thu, 01 Nov 2012 12:05:51 +0100, David Faure wrote: On Wednesday 31 October 2012 10:14:20 Aurélien Gâteau wrote: Le mardi 30 octobre 2012 12:16:40 David Faure a écrit : Ok, thanks. Is this documented somewhere ? No (I described it in an email some time ago, but it's not on any wiki) If you have an idea for where we could document it, I will then push other module maintainers to also write up the git workflow they want to see, since I myself have the same question in other modules. I think community.kde.org would be the right place (it's internal, it doesn't affect KDE app devels outside of git.kde.org), but all I can see about git is http://community.kde.org/Sysadmin/GitKdeOrgManual which is more about the technical setup. Maybe start a new webpage at the toplevel of community.kde.org? GitWorkflowForEachModule? :-) Would love such a page as well, but rather on techbase, as others suggested. OK. (seems I'm still confused about techbase vs community) Don't worry, you are not alone :) Additionally, when merging strategy is commit-to-stable then merge-into- master, it would be great if the document explicitly stated who is responsible for the merge-into-master step. I personally think it should be up to the person who commit to stable to merge into master. Unfortunately this is not how it works right now in kdelibs and I noticed people are expecting other repositories to work like kdelibs, as in someone is going to merge into master for them. I see. Well, it's going to change in kdelibs anyway, as soon as we branch out other modules for 4.10, we'll reopen master, it will be less confusing to everyone. And I agree about the person who commit to stable to merge into master because solving conflicts in other people's code is not fun, and dangerous. We could gently push people into doing the merging with two changes: Change #1 would be modifying the message you get when you push to a stable branch (the message which says this commit is available at http://...;) to include a reminder among the lines of don't forget to merge this commit into master, see http://techbase.kde.org/... for more info Good idea. Change #2 would be a cron job which would periodically checks for unmerged commits and send emails to committers of unmerged commits which are older than 1 or 2 days. Hmm, why not, but on the other hand there isn't much point in creating one merge commit for every trivial one-liner fix, it's ok to merge all of these in one go later on. I know I'm complicating things by saying that, basically dividing commits into trivial and might create a conflict on merging, and it's sometimes difficult to know which is which. Having to merge each one-liner at a time would indeed be painful, but this is not what I suggest: the reminders would be sent with a delay of 1 or 2 days, making it possible for you to do one single merge for a few one-liners without getting reminded. On the other hand, if you committed a one-liner more than 2 days ago and it has not been merged, the reminder would make sure it eventually gets in. Aurélien
Re: What is the git workflow for kdelibs ?
On Thursday, November 1, 2012 12:05:51 David Faure wrote: (seems I'm still confused about techbase vs community) I am happy to write something about this. In fact I (and others, too) have done so on both blogs and emails ... blogs not everyone reads, emails are ephemeral, so - where can I put this information where you (and others) are going to find it and can reference it? As soon as that is defined, I'll make sure the information is there asap. -- Aaron J. Seigo signature.asc Description: This is a digitally signed message part.
Re: What is the git workflow for kdelibs ?
On Wednesday 07 November 2012 12:48:26 Aaron J. Seigo wrote: On Thursday, November 1, 2012 12:05:51 David Faure wrote: (seems I'm still confused about techbase vs community) I am happy to write something about this. In fact I (and others, too) have done so on both blogs and emails ... blogs not everyone reads, emails are ephemeral, so - where can I put this information where you (and others) are going to find it and can reference it? As soon as that is defined, I'll make sure the information is there asap. We actually have http://wiki.kde.org/, which is meant to serve this information. Maybe we need to just improve this or make it more accessible. -- Cornelius Schumacher schumac...@kde.org
Re: What is the git workflow for kdelibs ?
On Wednesday, November 7, 2012 14:35:23 Cornelius Schumacher wrote: We actually have http://wiki.kde.org/, which is meant to serve this information. Maybe we need to just improve this or make it more accessible. the text could perhaps be clearer (and all 3 entries on one line instead of two; minor detail though) ... what probably is most important is to make this visible. a prominent link at the top of the main page might help that says something about it being a guide to kde wikis ... -- Aaron J. Seigo signature.asc Description: This is a digitally signed message part.
Re: What is the git workflow for kdelibs ?
On Wednesday 07 November 2012, Aaron J. Seigo wrote: On Thursday, November 1, 2012 12:05:51 David Faure wrote: (seems I'm still confused about techbase vs community) I am happy to write something about this. About the git workflow or about techbase vs. community ? The git workflow docs should go to techbase, probably in the git section IMO. Alex
Re: What is the git workflow for kdelibs ?
On Thursday 01 November 2012 20:44:14 Christoph Feck wrote: On Thursday 01 November 2012 12:05:51 David Faure wrote: as soon as we branch out other modules for 4.10, we'll reopen master, it will be less confusing to everyone. Good grief :P I just mean instead of having a 4.11 before everyone else, in kdelibs, (like we did for 4.10), let's call master the branch for 4.11. This will be more in line with every other module, and will confuse less people and scripts. I didn't mean reopening for new features, the merging into frameworks is already hard enough as it is. -- David Faure, fa...@kde.org, http://www.davidfaure.fr Working on KDE, in particular KDE Frameworks 5
Re: What is the git workflow for kdelibs ?
On Wednesday 31 October 2012 10:14:20 Aurélien Gâteau wrote: Le mardi 30 octobre 2012 12:16:40 David Faure a écrit : Ok, thanks. Is this documented somewhere ? No (I described it in an email some time ago, but it's not on any wiki) If you have an idea for where we could document it, I will then push other module maintainers to also write up the git workflow they want to see, since I myself have the same question in other modules. I think community.kde.org would be the right place (it's internal, it doesn't affect KDE app devels outside of git.kde.org), but all I can see about git is http://community.kde.org/Sysadmin/GitKdeOrgManual which is more about the technical setup. Maybe start a new webpage at the toplevel of community.kde.org? GitWorkflowForEachModule? :-) Would love such a page as well, but rather on techbase, as others suggested. OK. (seems I'm still confused about techbase vs community) Additionally, when merging strategy is commit-to-stable then merge-into- master, it would be great if the document explicitly stated who is responsible for the merge-into-master step. I personally think it should be up to the person who commit to stable to merge into master. Unfortunately this is not how it works right now in kdelibs and I noticed people are expecting other repositories to work like kdelibs, as in someone is going to merge into master for them. I see. Well, it's going to change in kdelibs anyway, as soon as we branch out other modules for 4.10, we'll reopen master, it will be less confusing to everyone. And I agree about the person who commit to stable to merge into master because solving conflicts in other people's code is not fun, and dangerous. We could gently push people into doing the merging with two changes: Change #1 would be modifying the message you get when you push to a stable branch (the message which says this commit is available at http://...;) to include a reminder among the lines of don't forget to merge this commit into master, see http://techbase.kde.org/... for more info Good idea. Change #2 would be a cron job which would periodically checks for unmerged commits and send emails to committers of unmerged commits which are older than 1 or 2 days. Hmm, why not, but on the other hand there isn't much point in creating one merge commit for every trivial one-liner fix, it's ok to merge all of these in one go later on. I know I'm complicating things by saying that, basically dividing commits into trivial and might create a conflict on merging, and it's sometimes difficult to know which is which. -- David Faure, fa...@kde.org, http://www.davidfaure.fr Working on KDE, in particular KDE Frameworks 5
Re: What is the git workflow for kdelibs ?
On Thursday 01 November 2012 12:05:51 David Faure wrote: as soon as we branch out other modules for 4.10, we'll reopen master, it will be less confusing to everyone. Good grief :P
Re: What is the git workflow for kdelibs ?
Le mardi 30 octobre 2012 12:16:40 David Faure a écrit : Ok, thanks. Is this documented somewhere ? No (I described it in an email some time ago, but it's not on any wiki) If you have an idea for where we could document it, I will then push other module maintainers to also write up the git workflow they want to see, since I myself have the same question in other modules. I think community.kde.org would be the right place (it's internal, it doesn't affect KDE app devels outside of git.kde.org), but all I can see about git is http://community.kde.org/Sysadmin/GitKdeOrgManual which is more about the technical setup. Maybe start a new webpage at the toplevel of community.kde.org? GitWorkflowForEachModule? :-) Would love such a page as well, but rather on techbase, as others suggested. Additionally, when merging strategy is commit-to-stable then merge-into- master, it would be great if the document explicitly stated who is responsible for the merge-into-master step. I personally think it should be up to the person who commit to stable to merge into master. Unfortunately this is not how it works right now in kdelibs and I noticed people are expecting other repositories to work like kdelibs, as in someone is going to merge into master for them. We could gently push people into doing the merging with two changes: Change #1 would be modifying the message you get when you push to a stable branch (the message which says this commit is available at http://...;) to include a reminder among the lines of don't forget to merge this commit into master, see http://techbase.kde.org/... for more info Change #2 would be a cron job which would periodically checks for unmerged commits and send emails to committers of unmerged commits which are older than 1 or 2 days. #1 is probably easy to do, #2 would require more work I assume, but shouldn't be too difficult, something like this gives you the email addresses of all commiters of unmerged commits: git log --pretty=%an %ae origin/master..origin/KDE/4.9 \ | grep -v scri...@kde.org | sort | uniq Aurélien
Re: What is the git workflow for kdelibs ?
On Sunday 28 October 2012 09:16:56 Alexander Neundorf wrote: On Saturday 27 October 2012, Allen Winter wrote: On Saturday 27 October 2012 03:23:34 PM Alexander Neundorf wrote: Hi, I have worked since last year basically only in the kdelibs frameworks branch... So, what is the git workflow for KDE 4.x kdelibs ? I looked around on techbase.kde.org, also here https://projects.kde.org/projects/kde/kdelibs , but couldn't find documentation. (This one http://techbase.kde.org/Policies still only has a SVN Commit Policy link, and AFAIK this http://community.kde.org/KDE_Core/Platform_11/Git_Workflow is not being used). So, should I simply pull and push to master, and somebody else will merge into the 4.10 branch ? No. Stay away from the kdelibs master branch. Besides only a small set of people can commit into that branch. For your average bug fix the work flow is: - commit into KDE/4.9 - merge into KDE/4.10 If you have something that should go into 4.10 only, then simply commit into KDE/4.10 Ok, thanks. Is this documented somewhere ? No (I described it in an email some time ago, but it's not on any wiki) If you have an idea for where we could document it, I will then push other module maintainers to also write up the git workflow they want to see, since I myself have the same question in other modules. I think community.kde.org would be the right place (it's internal, it doesn't affect KDE app devels outside of git.kde.org), but all I can see about git is http://community.kde.org/Sysadmin/GitKdeOrgManual which is more about the technical setup. Maybe start a new webpage at the toplevel of community.kde.org? GitWorkflowForEachModule? :-) -- David Faure, fa...@kde.org, http://www.davidfaure.fr Working on KDE, in particular KDE Frameworks 5
Re: What is the git workflow for kdelibs ?
On Tue, October 30, 2012 11:16 am, David Faure wrote: On Sunday 28 October 2012 09:16:56 Alexander Neundorf wrote: Ok, thanks. Is this documented somewhere ? No (I described it in an email some time ago, but it's not on any wiki) If you have an idea for where we could document it, I will then push other module maintainers to also write up the git workflow they want to see, since I myself have the same question in other modules. I think community.kde.org would be the right place (it's internal, it doesn't affect KDE app devels outside of git.kde.org), but all I can see about git is http://community.kde.org/Sysadmin/GitKdeOrgManual which is more about the technical setup. Maybe start a new webpage at the toplevel of community.kde.org? GitWorkflowForEachModule? :-) Wouldn't techbase be more appropriate? It's technical information, plus techbase is where other policies are kept. I must say that the split between community.kde.org and techbase.kde.org isn't very satisfactory because the boundaries are blurred, and it's easy to miss information if it's in the other one from what you expect it to be in. -- David Jarvie. KDE developer. KAlarm author - http://www.astrojar.org.uk/kalarm
Re: What is the git workflow for kdelibs ?
On 30 Oct 2012 11:23, David Jarvie djar...@kde.org wrote: On Tue, October 30, 2012 11:16 am, David Faure wrote: On Sunday 28 October 2012 09:16:56 Alexander Neundorf wrote: Ok, thanks. Is this documented somewhere ? No (I described it in an email some time ago, but it's not on any wiki) If you have an idea for where we could document it, I will then push other module maintainers to also write up the git workflow they want to see, since I myself have the same question in other modules. I think community.kde.org would be the right place (it's internal, it doesn't affect KDE app devels outside of git.kde.org), but all I can see about git is http://community.kde.org/Sysadmin/GitKdeOrgManual which is more about the technical setup. Maybe start a new webpage at the toplevel of community.kde.org? GitWorkflowForEachModule? :-) Wouldn't techbase be more appropriate? It's technical information, plus techbase is where other policies are kept. I must say that the split between community.kde.org and techbase.kde.org isn't very satisfactory because the boundaries are blurred, and it's easy to miss information if it's in the other one from what you expect it to be in. We have a section on TecBase for Git related documentation, and I think our Git workflow is needed information for anyone attempting to access our repos so belongs on TechBase. See techbase.kde.org/Developmemt/Git where I've linked under Policy to various proposals. We also need to formally update the old SVN Commit Policy to reflect the new age, I did start on it but stalled waiting for the kdelibs workflow to be finalised. John.
Re: What is the git workflow for kdelibs ?
On Tuesday 30 October 2012, John Layt wrote: On 30 Oct 2012 11:23, David Jarvie djar...@kde.org wrote: On Tue, October 30, 2012 11:16 am, David Faure wrote: On Sunday 28 October 2012 09:16:56 Alexander Neundorf wrote: Ok, thanks. Is this documented somewhere ? No (I described it in an email some time ago, but it's not on any wiki) If you have an idea for where we could document it, I will then push other module maintainers to also write up the git workflow they want to see, since I myself have the same question in other modules. I think community.kde.org would be the right place (it's internal, it doesn't affect KDE app devels outside of git.kde.org), but all I can see about git is http://community.kde.org/Sysadmin/GitKdeOrgManual which is more about the technical setup. Maybe start a new webpage at the toplevel of community.kde.org? GitWorkflowForEachModule? :-) Wouldn't techbase be more appropriate? It's technical information, plus techbase is where other policies are kept. I must say that the split between community.kde.org and techbase.kde.org isn't very satisfactory because the boundaries are blurred, and it's easy to miss information if it's in the other one from what you expect it to be in. We have a section on TecBase for Git related documentation, and I think our I'm very much for having this on techbase. Personally I can't find anything on community.kde.org except I have the direct link or searching turns up something. Git workflow is needed information for anyone attempting to access our repos so belongs on TechBase. See techbase.kde.org/Developmemt/Git where I've linked under Policy to various proposals. So a section KDE git workflows on this page http://techbase.kde.org/Development/Git ? Where it is basically documented how it is currently used ? We also need to formally update the old SVN Commit Policy to reflect the new age, I did start on it but stalled waiting for the kdelibs workflow to be finalised. I have the impression that in the meantime we (...ok, not me) should simply document the current state of things. Alex
Re: What is the git workflow for kdelibs ?
On Saturday 27 October 2012, Allen Winter wrote: On Saturday 27 October 2012 03:23:34 PM Alexander Neundorf wrote: Hi, I have worked since last year basically only in the kdelibs frameworks branch... So, what is the git workflow for KDE 4.x kdelibs ? I looked around on techbase.kde.org, also here https://projects.kde.org/projects/kde/kdelibs , but couldn't find documentation. (This one http://techbase.kde.org/Policies still only has a SVN Commit Policy link, and AFAIK this http://community.kde.org/KDE_Core/Platform_11/Git_Workflow is not being used). So, should I simply pull and push to master, and somebody else will merge into the 4.10 branch ? No. Stay away from the kdelibs master branch. Besides only a small set of people can commit into that branch. For your average bug fix the work flow is: - commit into KDE/4.9 - merge into KDE/4.10 If you have something that should go into 4.10 only, then simply commit into KDE/4.10 Ok, thanks. Is this documented somewhere ? Alex
What is the git workflow for kdelibs ?
Hi, I have worked since last year basically only in the kdelibs frameworks branch... So, what is the git workflow for KDE 4.x kdelibs ? I looked around on techbase.kde.org, also here https://projects.kde.org/projects/kde/kdelibs , but couldn't find documentation. (This one http://techbase.kde.org/Policies still only has a SVN Commit Policy link, and AFAIK this http://community.kde.org/KDE_Core/Platform_11/Git_Workflow is not being used). So, should I simply pull and push to master, and somebody else will merge into the 4.10 branch ? Thanks Alex
Re: What is the git workflow for kdelibs ?
On Saturday 27 October 2012 03:23:34 PM Alexander Neundorf wrote: Hi, I have worked since last year basically only in the kdelibs frameworks branch... So, what is the git workflow for KDE 4.x kdelibs ? I looked around on techbase.kde.org, also here https://projects.kde.org/projects/kde/kdelibs , but couldn't find documentation. (This one http://techbase.kde.org/Policies still only has a SVN Commit Policy link, and AFAIK this http://community.kde.org/KDE_Core/Platform_11/Git_Workflow is not being used). So, should I simply pull and push to master, and somebody else will merge into the 4.10 branch ? No. Stay away from the kdelibs master branch. Besides only a small set of people can commit into that branch. For your average bug fix the work flow is: - commit into KDE/4.9 - merge into KDE/4.10 If you have something that should go into 4.10 only, then simply commit into KDE/4.10
