Re: [cross-project-issues-dev] SimRel - direct push to master has been disabled

2018-11-13 Thread Frederic Gurr
Hi, I have changed the submit type to "fast-forward only" for the simrel/org.eclipse.simrel.build repo. Regards, Fred On 13.11.18 10:10, Ed Merks wrote: > Jonah, > > +1 for fast-forward-only > > In principle that could force one to rebase and then kick off another CI > Bot verification job,

Re: [cross-project-issues-dev] SimRel - direct push to master has been disabled

2018-11-13 Thread Ed Merks
Jonah, +1 for fast-forward-only In principle that could force one to rebase and then kick off another CI Bot verification job, but that's not so likely to occur much in practice. Cheers, Ed On 13.11.2018 09:55, Jonah Graham wrote: Hi Ed, If you want you can do a "Rebase" in the Gerrit UI

Re: [cross-project-issues-dev] SimRel - direct push to master has been disabled

2018-11-13 Thread Jonah Graham
Hi Ed, If you want you can do a "Rebase" in the Gerrit UI before doing the Submit. Alternatively, and what I personally prefer is to set gerrit's merge strategy to either Fast forward only, or rebase. The Eclipse platform uses fast forward only. This prevents any merge commits and ensures that

Re: [cross-project-issues-dev] SimRel - direct push to master has been disabled

2018-11-13 Thread Ed Willink
Hi Ah! It never occurred to me that "Reply" meant "Commit" / "Push" / "Merge" or even "Review". I saw only "Cherry Pick" / " Cancel" which did not match my requirements. What a truly awful UI. What if I don't want to "Merge" since it leads to double history entries that on normal projects

Re: [cross-project-issues-dev] SimRel - direct push to master has been disabled

2018-11-12 Thread Ed Merks
Ed, Normally you would use the Gerrit review link to finish the processing.  E.g., for the last commit I used this link:   https://git.eclipse.org/r/#/c/132049/ After the initial commit, I waited for the build to finish so that CI Bot (one of the automatic reviewers) adds a +1.  That takes

Re: [cross-project-issues-dev] SimRel - direct push to master has been disabled

2018-11-12 Thread Ed Willink
Hi Sorry I must have missed something. My no doubt flawed recollection was that we were assured (again) that direct push would continue to be allowed. I certainly use it every time since I see no other way to do it. I push to Gerrit, check for build success, then Push to master. Given that

[cross-project-issues-dev] SimRel - direct push to master has been disabled

2018-11-12 Thread Frederic Gurr
Hi, As discussed before, direct push to master for the SimRel aggregation build repository (https://git.eclipse.org/r/simrel/org.eclipse.simrel.build) has been disabled. So, all future commits have to go through a Gerrit review and should get a +1 from the CI server before being merged. The