Did you do git commit locally first? One caveat is that if you don't install authors files properly, the apache svn is going to fix it in the commit metadata. The effect of that is that your local commit would have a different hash and dcommit may not necessarily immediately realize that. When this happens, next time you fetch, it will report that your local git and remote apache.git trunk have diverged... on your own commit!
If you pull at that moment, you are likely to receive some ugliness in form of a merge commit of two versions of your own commit. The remedy is reset one step back and pull again, so that you are at the top of what's at the remote. That's probably the only ugly thing with this integration. Another thing if you are squashing a history of a side branch during commit, you cannot safely continue developing on the side branch assuming you will be able to fast forward again. If you do a squash, from git's point of view, those two branches have diverged and it will request an ugly merge next time. The remedy is never to do more than one squash per branch, i think . You either need to open a new side branch based on current trunk or squash existing side branch history too. It may get a little complicated like that at times, but commits are a tree, so eventually it becomes easier to navigate (use something like git log --time-order --graph to see what is happening, it is not very obvious without that at times). thanks. -d On Thu, Oct 6, 2011 at 11:36 AM, Grant Ingersoll <[email protected]> wrote: > I'm trying to fix. My git svn dcommit is not doing what I expected it to do. > > Begin forwarded message: > >> From: [email protected] >> Subject: svn commit: r1179753 - /mahout/trunk/bin/mahout >> Date: October 6, 2011 2:32:19 PM EDT >> To: [email protected] >> Reply-To: [email protected] >> >> Author: gsingers >> Date: Thu Oct 6 18:32:18 2011 >> New Revision: 1179753 >> >> URL: http://svn.apache.org/viewvc?rev=1179753&view=rev >> Log: >> merge >> >> Modified: >> mahout/trunk/bin/mahout >> >> Modified: mahout/trunk/bin/mahout >> URL: >> http://svn.apache.org/viewvc/mahout/trunk/bin/mahout?rev=1179753&r1=1179752&r2=1179753&view=diff >> ============================================================================== >> --- mahout/trunk/bin/mahout (original) >> +++ mahout/trunk/bin/mahout Thu Oct 6 18:32:18 2011 >> @@ -211,10 +211,14 @@ if [ "$HADOOP_HOME" = "" ] || [ "$MAHOUT >> ;; >> (*) >> <<<<<<< HEAD >> +<<<<<<< HEAD >> CLASSPATH=$CLASSPATH exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS $CLASS >> "$@" >> ======= >> exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS -classpath "$CLASSPATH" >> $CLASS "$@" >>>>>>>>> b2289f420c0702f4ceeb5e1488c0977cd70f5f89 >> +======= >> + CLASSPATH=$CLASSPATH exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS $CLASS >> "$@" >> +>>>>>>> 998503d2d2897f1c7c661584237b487edc8ef4a9 >> esac >> else >> echo "Running on hadoop, using HADOOP_HOME=$HADOOP_HOME" >> >> > > -------------------------------------------- > Grant Ingersoll > http://www.lucidimagination.com > Lucene Eurocon 2011: http://www.lucene-eurocon.com > >
