Apologize for committing the patch to the trunk. Looks like there is a screen time during which commit actions should be avoided. In addition to this, any other issue that may also affect the release? I would like to document this because it is a good example as a guideline so that when other members perform similar tasks, the same issue will not be repeated.
Thanks for the explanation. On 17 September 2013 20:59, Tommaso Teofili <tommaso.teof...@gmail.com> wrote: > I'll try to explain why IMHO it's usually better to not commit to trunk > while voting release candidates (I realize now I did it myself some days > ago too, sorry :) ). > > When the release manager runs the command 'mvn release:prepare' a bunch of > things happen, one of them is the current trunk pom.xml files being moved > to the "next development iteration" which for us is 0.7.0-SNAPSHOT > therefore if the release vote doesn't pass and the release has to be rolled > back, the pom.xml files have to be moved back to their previous versions > (e.g. 0.6.2-SNAPSHOT) which is done by the release manager via the command > 'mvn release:rollback' > > If someone has committed changes to the trunk this may cause the following: > 1. running mvn release:rollback may fail due to incompatible SVN changes > (to be merged manually) on pom files (this might be the case of the > mentioned change on hama-pipes pom.xml) > 2. committed change being silently rolled back and overwritten by 'mvn > release:rollback' > 3. a snapshot of hama-core 0.7.0-SNAPSHOT containing changes targeted for > e.g. 0.6.3 being deployed on snapshot-repositories (not a big problem but > still a bit "not consistent") > > Given that I'm of course not against your commit, just it's possible that > Edward's rollback command will overwrite it, so let's keep in mind we have > to check that. > > Regards, > Tommaso > > > > 2013/9/17 Chia-Hung Lin <cli...@googlemail.com> > >> Any reason why this has to be rollback e.g. procedure, format, etc. >> because I would need this patch to be in? >> >> If it's procedure, format, etc., do we have guideline on wiki? >> Checking wiki such as jekins, HowTOCommit doesn't contain related >> information. >> >> Thanks >> >> On 17 September 2013 16:52, Tommaso Teofili <tommaso.teof...@gmail.com> >> wrote: >> > ok, no problem, just let's not commit anything else before Edward con do >> > the rollback. >> > Tommaso >> > >> > >> > 2013/9/17 Edward J. Yoon <edwardy...@apache.org> >> > >> >> Sorry, I'm on vacation, will be back 2 days later. >> >> >> >> -- >> >> Best Regards, Edward J. Yoon >> >> @eddieyoon >> >> >> >> On 2013. 9. 17., at 오후 5:40, Tommaso Teofili <tommaso.teof...@gmail.com >> > >> >> wrote: >> >> >> >> > I think we need Edward to run 'mvn release:rollback' as soon as >> possible >> >> > (as latest vote has been canceled) and then commit this again. >> >> > >> >> > Tommaso >> >> > >> >> > >> >> > 2013/9/15 <chl...@apache.org> >> >> > >> >> >> Author: chl501 >> >> >> Date: Sun Sep 15 10:20:01 2013 >> >> >> New Revision: 1523425 >> >> >> >> >> >> URL: http://svn.apache.org/r1523425 >> >> >> Log: >> >> >> HAMA-802: Skip Hama Pipes native build when cmake is missing >> >> >> >> >> >> Modified: >> >> >> hama/trunk/c++/pom.xml >> >> >> hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc >> >> >> >> >> >> Modified: hama/trunk/c++/pom.xml >> >> >> URL: >> >> >> >> >> >> http://svn.apache.org/viewvc/hama/trunk/c%2B%2B/pom.xml?rev=1523425&r1=1523424&r2=1523425&view=diff >> >> >> >> >> >> >> >> >> ============================================================================== >> >> >> --- hama/trunk/c++/pom.xml (original) >> >> >> +++ hama/trunk/c++/pom.xml Sun Sep 15 10:20:01 2013 >> >> >> @@ -31,7 +31,7 @@ >> >> >> <description>Apache Hama Pipes</description> >> >> >> <packaging>pom</packaging> >> >> >> >> >> >> - <profiles> >> >> >> + <profiles> >> >> >> <profile> >> >> >> <id>native</id> >> >> >> <activation> >> >> >> @@ -49,16 +49,32 @@ >> >> >> <goals><goal>run</goal></goals> >> >> >> <configuration> >> >> >> <target> >> >> >> - <mkdir >> dir="${project.build.directory}/native" /> >> >> >> - <exec executable="cmake" >> >> >> dir="${project.build.directory}/native" failonerror="true"> >> >> >> - <arg line="${basedir}/src/ >> >> >> -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}" /> >> >> >> - </exec> >> >> >> - <exec executable="make" >> >> >> dir="${project.build.directory}/native" failonerror="true"> >> >> >> - <arg line="VERBOSE=1" /> >> >> >> - </exec> >> >> >> - <!-- The second make is a workaround for >> >> >> HADOOP-9215. It can >> >> >> - be removed when version 2.6 of cmake is >> no >> >> >> longer supported . --> >> >> >> - <exec executable="make" >> >> >> dir="${project.build.directory}/native" failonerror="true" /> >> >> >> + <taskdef >> >> >> resource="net/sf/antcontrib/antcontrib.properties" >> >> >> classpathref="maven.plugin.classpath" /> >> >> >> + <!-- Check if cmake is installed --> >> >> >> + <property environment="env" /> >> >> >> + <if> >> >> >> + <or> >> >> >> + <available file="cmake" >> >> filepath="${env.PATH}" >> >> >> /> >> >> >> + <!-- on Windows it can be Path, path --> >> >> >> + <available file="cmake" >> >> filepath="${env.Path}" >> >> >> /> >> >> >> + <available file="cmake" >> >> filepath="${env.path}" >> >> >> /> >> >> >> + </or> >> >> >> + <then> >> >> >> + <mkdir >> >> dir="${project.build.directory}/native" >> >> >> /> >> >> >> + <exec executable="cmake" >> >> >> dir="${project.build.directory}/native" failonerror="true"> >> >> >> + <arg line="${basedir}/src/ >> >> >> -DJVM_ARCH_DATA_MODEL=${sun.arch.data.model}" /> >> >> >> + </exec> >> >> >> + <exec executable="make" >> >> >> dir="${project.build.directory}/native" failonerror="true"> >> >> >> + <arg line="VERBOSE=1" /> >> >> >> + </exec> >> >> >> + <!-- The second make is a workaround for >> >> >> HADOOP-9215. It can >> >> >> + be removed when version 2.6 of cmake >> is >> >> no >> >> >> longer supported . --> >> >> >> + <exec executable="make" >> >> >> dir="${project.build.directory}/native" failonerror="true" /> >> >> >> + </then> >> >> >> + <else> >> >> >> + <echo>CMAKE is missing! Skipping >> native >> >> >> build!</echo> >> >> >> + </else> >> >> >> + </if> >> >> >> </target> >> >> >> </configuration> >> >> >> </execution> >> >> >> @@ -75,6 +91,13 @@ >> >> >> </execution> >> >> >> --> >> >> >> </executions> >> >> >> + <dependencies> >> >> >> + <dependency> >> >> >> + <groupId>ant-contrib</groupId> >> >> >> + <artifactId>ant-contrib</artifactId> >> >> >> + <version>20020829</version> >> >> >> + </dependency> >> >> >> + </dependencies> >> >> >> </plugin> >> >> >> </plugins> >> >> >> </build> >> >> >> >> >> >> Modified: hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc >> >> >> URL: >> >> >> >> >> >> http://svn.apache.org/viewvc/hama/trunk/c%2B%2B/src/main/native/pipes/impl/HamaPipes.cc?rev=1523425&r1=1523424&r2=1523425&view=diff >> >> >> >> >> >> >> >> >> ============================================================================== >> >> >> --- hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc (original) >> >> >> +++ hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc Sun Sep 15 >> >> >> 10:20:01 2013 >> >> >> @@ -23,6 +23,7 @@ >> >> >> #include <map> >> >> >> #include <vector> >> >> >> >> >> >> +#include <unistd.h> >> >> >> #include <errno.h> >> >> >> #include <netinet/in.h> >> >> >> #include <stdint.h> >> >> >> >> >> >> >> >> >> >> >> >> >> >>
