Need to cherry pick in reverse order.
authorFrantišek Dvořák <valtri@civ.zcu.cz>
Fri, 8 Apr 2011 22:58:10 +0000 (00:58 +0200)
committerFrantišek Dvořák <valtri@civ.zcu.cz>
Fri, 8 Apr 2011 22:58:10 +0000 (00:58 +0200)
cvs2git-inc.sh

index 34ea9d2..2a2811b 100755 (executable)
@@ -60,10 +60,10 @@ branch_RC31_3   4316f8ac93d4cfa61b471676c2f81e70f62f1b69
 branch_2_0      385a0a242b5e4666192f1198df92d7d451c79164
 branch_2_1      46021c94148d9d688604bcdbec0344e946d70053
 branch_workflow a0a362418b99167f40d1328ea8a934b147372329
-master          86d4a33945bc77fe59369840a54d9d8a7c9e3ef3" | while read branch start; do
+master          c00ac595d4fe2c9b20e5440ff811f479f818e87c" | while read branch start; do
        echo "$start..cvssync/$branch"
        git checkout $branch || break
-       cl=`git log --format=%H $start..cvssync/$branch -- | grep -v '\(e6919c\|1f39df\|1f39df\)'`
+       cl=`git log --format='%ct %H' $start..cvssync/$branch -- | grep -v '\(e6919c\|1f39df\|1f39df\)' | sort -n | cut -f2 -d' '`
        for c in $cl; do
                git cherry-pick $c
        done