Mikko,
> I understand that this can already be done with git. The method is
>
> 1) store the current HEAD somewhere
> 2) figure out the proper parent for the bug fix
> 3) checkout the parent
> 4) implement the fix
> 5) commit the fix
> 6) checkout HEAD
> 7) merge with the commit from step 5
I would probably create a topic/fix branch:
1) figure out the proper parent for the bug fix
2) create the fix branch and move to it
$ git co -b fix-feature-whatever parent
3) implement the fix
4) commit the fix
5) checkout HEAD
6) merge with the commit from step 4
And also merge on release branch if needed.
Pascal.
--
--|------------------------------------------------------
--| Pascal Obry Team-Ada Member
--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE
--|------------------------------------------------------
--| http://www.obry.net
--| "The best way to travel is by means of imagination"
--|
--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595
--
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