[yast-devel] Updating CONTRIBUTING.md?
Hi all, Our CONTRIBUTING.md files say: Do not change the VERSION and *.changes files as this could lead to conflicts. But that means we need to open a separate Pull Request with just the version update and added changes after merging a contribution. See e.g. [1], [2]. I find this a bit annoying, esp. for trivial PRs which we could just merge and be done with that. I'd suggest to change it to the opposite: ask the contributors to update the version and add a changes entry. If reviewing of a PR takes more time and there is another change merged in the meantime we could simply ask the contributor to resolve the conflict and update the PR. What do you think about it? What is your experience? Ladislav [1] https://github.com/yast/yast-theme/pull/69 [2] https://github.com/yast/yast-theme/pull/70 -- Ladislav Slezák Appliance department / YaST Developer Lihovarská 1060/12 190 00 Prague 9 / Czech Republic tel: +420 284 028 960 lslezak@suse.com SUSE -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On Wed, 17 Aug 2016 09:35:44 +0200
Ladislav Slezak
Hi all,
Our CONTRIBUTING.md files say:
Do not change the VERSION and *.changes files as this could lead to conflicts.
But that means we need to open a separate Pull Request with just the version update and added changes after merging a contribution. See e.g. [1], [2].
I find this a bit annoying, esp. for trivial PRs which we could just merge and be done with that.
I'd suggest to change it to the opposite: ask the contributors to update the version and add a changes entry.
If reviewing of a PR takes more time and there is another change merged in the meantime we could simply ask the contributor to resolve the conflict and update the PR.
What do you think about it? What is your experience?
I fully agree, it is a bit annoying. Maybe we can add note that if it is long running pr, then changes and version increase should be done as last step. But not having changes and version update is annoying. Josef
Ladislav
[1] https://github.com/yast/yast-theme/pull/69 [2] https://github.com/yast/yast-theme/pull/70
--
Ladislav Slezák Appliance department / YaST Developer Lihovarská 1060/12 190 00 Prague 9 / Czech Republic tel: +420 284 028 960 lslezak@suse.com SUSE
-- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On 17.8.2016 09:43, Josef Reidinger wrote:
On Wed, 17 Aug 2016 09:35:44 +0200 Ladislav Slezak
wrote: What do you think about it? What is your experience?
I fully agree, it is a bit annoying. Maybe we can add note that if it is long running pr, then changes and version increase should be done as last step. But not having changes and version update is annoying.
+1 I don't remember seeing anyone "not updating changes and version" in their PR (unless it was explicitly intended). I myself do not do so, and I'm not expecting anyone to do it either. Bye Lukas -- Lukas Ocilka, Systems Management (Yast) Team Leader SLE Department, SUSE Linux https://en.wikipedia.org/wiki/Scout_Promise#Czech_Republic http://www.scouting.org/Visitor/WhyScouting/ServingOthers.aspx -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
Dne 17.8.2016 v 09:43 Josef Reidinger napsal(a):
On Wed, 17 Aug 2016 09:35:44 +0200 Ladislav Slezak
wrote: Maybe we can add note that if it is long running pr, then changes and version increase should be done as last step.
Yes, that's a good idea. I'll propose some text... -- Ladislav Slezák Appliance department / YaST Developer Lihovarská 1060/12 190 00 Prague 9 / Czech Republic tel: +420 284 028 960 lslezak@suse.com SUSE -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
My proposal is here: https://github.com/yast/yast-yast2/pull/490 Let's discuss it there... -- Ladislav Slezák Appliance department / YaST Developer Lihovarská 1060/12 190 00 Prague 9 / Czech Republic tel: +420 284 028 960 lslezak@suse.com SUSE -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
Dne 17.8.2016 v 15:32 Ladislav Slezak napsal(a):
My proposal is here: https://github.com/yast/yast-yast2/pull/490 Let's discuss it there...
I have updated the proposed changes and added some more fixes (thanks HuHa for the proofreading!). The plan is to merge this pull request to the yast2 package and then update the file in other repositories by a script automatically (directly in master, without pull requests). If you have another idea how to improve that file just comment in the PR. Thank you! -- Ladislav Slezák YaST Developer lslezak@suse.com SUSE -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On Thu, Aug 18, 2016 at 12:08:10PM +0200, Ladislav Slezak wrote:
Dne 17.8.2016 v 15:32 Ladislav Slezak napsal(a):
My proposal is here: https://github.com/yast/yast-yast2/pull/490 Let's discuss it there...
I have updated the proposed changes and added some more fixes (thanks HuHa for the proofreading!).
The plan is to merge this pull request to the yast2 package and then update the file in other repositories by a script automatically (directly in master, without pull requests).
If you have another idea how to improve that file just comment in the PR.
I have merged the PR and updated all existing copies of the file (having first checked their md5sums) Thanks to Lada and the reviewers! -- Martin Vidner, YaST Team http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu
participants (4)
-
Josef Reidinger
-
Ladislav Slezak
-
Lukas Ocilka
-
Martin Vidner