Le 29/11/2009 17:28, Peter Weseloh a écrit :
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.
In such a case I would use a rebase onto:
$ git co Feature_A
$ git rebase --onto Release_1.0 F1 F3
Then
$ git co Release_1.0
$ git merge Feature_A
Pascal.
--
--|------------------------------------------------------
--| Pascal Obry Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--| http://www.obry.net - http://v2p.fr.eu.org
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver keys.gnupg.net --recv-key F949BD3B
--
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