Just to clarify - the merge script is effectively squash merge. it does better job on collecting the pull request descriptions, reviewers' information to form an better description for the commit. If we are using 'squash merge' button, we have to manually copy the description and write the commit messages.
If we want to have a standard commit message, we should just disable merge buttons and use merge script. - Sijie On Thu, Jun 29, 2017 at 3:44 AM, Sijie Guo <guosi...@gmail.com> wrote: > I don't use squash merge. I am still using the merge-script for merging > pull requests. I've already updated the wiki page. You just need to > configure 'apache' remote using github repo and you are done. > > - Sijie > > > On Thu, Jun 29, 2017 at 1:20 AM, Enrico Olivelli <eolive...@gmail.com> > wrote: > >> 2017-06-29 8:54 GMT+02:00 Enrico Olivelli <eolive...@gmail.com>: >> > 2017-06-29 4:06 GMT+02:00 Jia Zhai <zhaiji...@gmail.com>: >> >> Hi Sijie, >> >> opened a ticket https://issues.apache.org/jira/browse/INFRA-14470 to >> only >> >> "squash merge" >> >> Thanks >> >> >> >> On Thu, Jun 29, 2017 at 5:17 AM, Sijie Guo <guosi...@gmail.com> wrote: >> >> >> >>> Hi Enrico, >> >>> >> >>> The gitbox is the readonly mirror of the github repo. The github repo >> is >> >>> the source of truth. So we should use the github repo for jenkins >> build and >> >>> also for patch submissions. >> >>> >> >>> The merge script uses 'apache' remote as the destination for pushing >> the >> >>> squashed changes and uses 'apache-github' remote as the source for >> fetching >> >>> pull requests. so we have to use the github repo for both 'apache' and >> >>> 'apache-github' remotes, then the merge script can work without >> changing >> >>> anything. >> > >> > Did you try to use the "merge " button for merging recent PRs ? >> >> >> I have used the "Merge and Squash button" >> >> I had to manually adjust the commit message (clean it up) and add "closes >> #212" >> >> I think we should continue using the merge script >> >> below there is the result on "git log". >> >> commit b9648998802ce4bf256e33ffd6296b4c973a4824 >> Author: Jia Zhai <jiaz...@users.noreply.github.com> >> Date: Thu Jun 29 16:17:58 2017 +0800 >> >> Issue 212: change github PR template to adjust both issue# and jira# >> (#213) >> >> change PR template to adjust both issue# and jira# >> >> closes #212 >> >> >> -- Enrico >> >> >> > Honestly I prefer the merge script anyway because it gives use the >> > chance to check our QA standards and tracks reviewers and the original >> > contributor in the git logs. >> > I used the "merge button" in other projects but sometimes (for long >> > PRs) the final result was not "awesome" >> > >> > @Sijie >> > are you going to fix jenkins jobs and the wiki ? I can to it either >> > >> > I think that we should make a clear recap about GIT repos on the dev@ >> > list and in a wiki page >> > >> > I will try to use the merge script next time I merge some pull request >> > >> > -- Enrico >> > >> >>> >> >>> - Sijie >> >>> >> >>> On Wed, Jun 28, 2017 at 5:07 AM, Enrico Olivelli <eolive...@gmail.com >> > >> >>> wrote: >> >>> >> >>> > I am going on with trials in order to discover our new space before >> >>> > hitting bad problems. >> >>> > >> >>> > If you try to access the old git repo you will get >> >>> > >> >>> > [enrico.olivelli@localhost bookkeeper]$ git pull apache master >> >>> > fatal: repository >> >>> > 'https://git-wip-us.apache.org/repos/asf/bookkeeper.git/' not found >> >>> > >> >>> > As the old repo is not working anymore.... >> >>> > >> >>> > I have updated the master Jenkins job >> >>> > https://builds.apache.org/job/bookkeeper-master/ >> >>> > >> >>> > I have just updated the wiki page as well >> >>> > https://cwiki.apache.org/confluence/display/BOOKKEEPER/Patch >> +Sumission >> >>> > >> >>> > -- Enrico >> >>> > >> >>> > 2017-06-28 13:20 GMT+02:00 Enrico Olivelli <eolive...@gmail.com>: >> >>> > > This is great >> >>> > > it seems that we have also a GitHub team for bookkeeper committers >> >>> > > https://github.com/orgs/apache/teams/bookkeeper-committers/ >> members >> >>> > > >> >>> > > -- Enrico >> >>> > > >> >>> > > >> >>> > > 2017-06-28 12:29 GMT+02:00 Enrico Olivelli <eolive...@gmail.com>: >> >>> > >> Hi Jia, >> >>> > >> this is a very important change !! >> >>> > >> >> >>> > >> Do you now what will happen if any committers uses >> >>> > >> git-ws-us.apache.org as usual ? >> >>> > >> is there any chance to break things ? >> >>> > >> >> >>> > >> we should immediately update the wiki page >> >>> > >> https://cwiki.apache.org/confluence/display/BOOKKEEPER/ >> >>> Patch+Sumission >> >>> > >> >> >>> > >> let's wait for Sijie acknowledge >> >>> > >> >> >>> > >> Thank you >> >>> > >> -- Enrico >> >>> > >> >> >>> > >> >> >>> > >> >> >>> > >> 2017-06-28 12:24 GMT+02:00 Jia Zhai <zhaiji...@gmail.com>: >> >>> > >>> Hi All, >> >>> > >>> Thanks to the help from INFRA team, now bookkeeper repo has been >> >>> moved >> >>> > into >> >>> > >>> gitbox. >> >>> > >>> >> >>> > >>> The new URL (on our side) is >> >>> > >>> https://gitbox.apache.org/repos/asf/bookkeeper.git >> >>> > >>> For committers, please go through the setup at >> >>> > >>> https://gitbox.apache.org/setup/ >> >>> > >>> >> >>> > >>> Thanks. >> >>> > >> >>> >> > >
