Peter Weseloh venit, vidit, dixit 29.11.2009 17:28: > Hi, > > Suppose I have the following situation: > > o--o--o Release_1.0 > / \ \ > o-o-o--o--o-o-o-o-o-o---o--o Mainline > \ \ \ / > F1--F2--M1--F3--M2 Feature_A > > Now I want to backport "Feature_A" to the "Release_1.0" branch so that it gets > included into the next minor release, i.e. I want to apply the commits F1, F2 > and F3 onto the "Release_1.0" branch. > I cannot just merge "Feature_A" into "Release_1.0" because that would also bring > in the merges M1 and M2 so a lot of other stuff from the Mainline. > > I played with cherry-pick but that means I have to manually find the commits F1, > F2 and F3 (which in reality could be many more if Feature_A is big) which is not > very nice. > > I also tried 'rebase -i' but that means I have to manually delete all the lines > for changesets from the mainline. Also not very nice. > > Is there a better way? To me this scenario sounds not unusual but I could not > find a solution. The problem is that you've been a bad boy to begin with ;) Seriously, I suggest reading up on "topic branches". Feature_A should have been based off the common merge base of Mainline and Release_1.0, and, even more importantly, there should not have been any merges from Mainline into Feature_A. So, that branch is not at all what one would call a feature branch/topic branch. Hopefully, this scenario is very uncommon :) I assume you have to deal with the given structure anyhow, and merge will not help. The only solution is to try and replay your Feature_A commits on top of the release branch. (Since you have merged Feature_A into Mainline already, you probabably don't want to redo that branch and merge.) I you have many commits to deal with I suggest finding a good semi-automated way to list the commits you are after, such as git rev-list --no-merges sha1..Feature_A (with sha1 being the fork point). A good way to find out could be git log --no-merges sha1..Feature_A. Then, try and cherry-pick those onto the release branch. Alternatively, you can use format-patch/am, or in fact try with rebase (I thought it would ignore merges), which basically does what cherry-pick does. Cheers, Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html