Re: Git history problem

2020-03-13 Thread Jacques Le Roux
Some notes before I forget: 1. Except if Infra (or I) missed something, GH "Rebase and Merge" does not always create a linear commit history. See the log of ofbiz-site after the "Rebase and Merge" I did for PR1. If commits happen beetwen it's does not deliver a linear commit history. 2.

Re: Git history problem

2020-03-13 Thread Jacques Le Roux
Hi All, This is done, you may check with an open GH PR We will now ask Infra to add GH Issues[1]. It needs again a PMC agreement. [1] https://help.github.com/en/github/managing-your-work-on-github/creating-an-issue Jacques Le 10/03/2020 à 11:22, Jacques Le Roux a écrit : The infra team

Re: Adopting Github Workflow (was: Git history problem)

2020-03-11 Thread Pierre Smits
As the philosopher Yoda once stated: "Do or Do Not, There is no try'. Having a restriction on how (potential) non-privileged contributors can contribute is not a good thing for this project. What it will lead to is more instead of less hurdles to contribute. Some may report a bug in an email

Re: Git history problem

2020-03-11 Thread Gil Portenseigne
+1 IMO i prefer to rebase and check the commit i push in my local repo. Thanks Le 11 mars 2020 16:52:36 GMT+01:00, Mathieu Lirzin a écrit : >>> The simple solution to prevent this is to get into the habit of >>> linearizing history, meaning always rebasing and clean history >before >>>

Re: Git history problem

2020-03-11 Thread Mathieu Lirzin
Jacques Le Roux writes: > Le 11/03/2020 à 12:33, Mathieu Lirzin a écrit : >> Yes things seems to happen not magically but by putting earplugs on and >> going ahead, which is certainly more effective but IMO not acceptable >> when working within a community. > > I'm not sure to who it's destined,

Re: Adopting Github Workflow (was: Git history problem)

2020-03-11 Thread Jacopo Cappellato
On Wed, Mar 11, 2020 at 4:30 PM Mathieu Lirzin wrote: > [...] > - Adopt Github Pull Request (PR) as the unique channel for code > contribution > +1 > - Require tickets only for bug reports > +1 > - Replace JIRA with Github issues > I am not sure about this: we have a huge backlog of

Adopting Github Workflow (was: Git history problem)

2020-03-11 Thread Mathieu Lirzin
Jacques Le Roux writes: > Le 11/03/2020 à 12:33, Mathieu Lirzin a écrit : This said you certainly saw this thread started by Pierre Smits: >>> https://markmail.org/message/so7ljoqxzuq7jplz and the related wiki >>> document >>>

Re: Git history problem

2020-03-11 Thread Jacques Le Roux
Le 11/03/2020 à 12:33, Mathieu Lirzin a écrit : Yes things seems to happen not magically but by putting earplugs on and going ahead, which is certainly more effective but IMO not acceptable when working within a community. I'm not sure to who it's destined, so I'll not take it for me :)

Re: Git history problem

2020-03-11 Thread Jacques Le Roux
Le 11/03/2020 à 12:33, Mathieu Lirzin a écrit : This said you certainly saw this thread started by Pierre Smits: https://markmail.org/message/so7ljoqxzuq7jplz and the related wiki document https://cwiki.apache.org/confluence/display/OFBIZ/Contributing+via+Git+and+Github AIUI this page is

Re: Git history problem

2020-03-11 Thread Pierre Smits
The remark about 'not acceptable when working within a community' reminds me of the the joke about 'How many community members does it take to get four wheel nuts loosened'. It takes 4: 1 loosening the nuts and 3 others discussing JFDI (putting on the earplugs, and doing it) is part of the

Re: Git history problem

2020-03-11 Thread Mathieu Lirzin
Hello Jacques, Jacques Le Roux writes: > If my opinion is worth telling, I was initially reluctant to use the > PR process instead of the patch process. Because in general I prefer > to control things, it's even sometimes a problem for me in real > life. I must say it was more laziness which

Git commits email notification problem (was: Git history problem)

2020-03-11 Thread Mathieu Lirzin
Hello Jacques, Here is a first answer on the specific point of the commit notification issue. Jacques Le Roux writes: > I noticed that sometimes strange things happen when you use a > PR. Consider this recent email for instance: > https://markmail.org/message/amq5fj2dfma7pcbb. > > There is

Re: Git history problem

2020-03-10 Thread Michael Brohl
This is why I was advocating to leave the wiki page in WIP state until the command line process is described also. We should rework the wiki page to also show the command line process to merge PR's on the local sandbox which permits ultimate control about what is going to be pushed to the

Re: Git history problem

2020-03-10 Thread Jacques Le Roux
The infra team requires a PMC decision for this change, see https://issues.apache.org/jira/browse/INFRA-19950 Jacques Le 10/03/2020 à 10:57, Jacques Le Roux a écrit : Le 09/03/2020 à 17:58, Mathieu Lirzin a écrit : Hello, The history of OFBiz trunk with the adoption of the Pull Request

Re: Git history problem

2020-03-10 Thread Jacques Le Roux
Le 09/03/2020 à 17:58, Mathieu Lirzin a écrit : Hello, The history of OFBiz trunk with the adoption of the Pull Request based contribution process is getting less and less readable. Here is a snippet of `git log --oneline --graph` demonstrating that: --8<---cut

Re: Git history problem

2020-03-10 Thread Jacopo Cappellato
I think that the ASF Infra will have to take care of this configuration change. I have noticed that Jacques already filed a request a few minutes ago [*] so let's wait and see. Jacopo [*] https://issues.apache.org/jira/browse/INFRA-19950 On Tue, Mar 10, 2020 at 7:25 AM Michael Brohl wrote: >

Re: Git history problem

2020-03-10 Thread Mathieu Lirzin
Michael Brohl writes: > I tried to follow the instructions found behind the link Mathieu > provided and see that I cannot change the project settings. > > Who has access to the project settings and can grant me permission to > change settings? Thanks Michael for this attempt. -- Mathieu

Re: Git history problem

2020-03-10 Thread Michael Brohl
I tried to follow the instructions found behind the link Mathieu provided and see that I cannot change the project settings. Who has access to the project settings and can grant me permission to change settings? Thanks, Michael Brohl ecomify GmbH - www.ecomify.de Am 09.03.20 um 22:39

Re: Git history problem

2020-03-09 Thread Michael Brohl
+1 It is easy to prevent this by using rebase merging but committers have to care about it. If Github can be configured to prevent merge commits we should do so. Thanks, Michael > Am 09.03.2020 um 17:58 schrieb Mathieu Lirzin : > > Hello, > > The history of OFBiz trunk with the adoption of

Git history problem

2020-03-09 Thread Mathieu Lirzin
Hello, The history of OFBiz trunk with the adoption of the Pull Request based contribution process is getting less and less readable. Here is a snippet of `git log --oneline --graph` demonstrating that: --8<---cut here---start->8--- a3bcdc4cc3 * | Improved: