OoO En ce début d'après-midi ensoleillé du samedi 06 février 2010, vers 15:15, Goswin von Brederlow <goswin-...@web.de> disait :
> He wants to KISS. So lets make it even simpler.
> - master: patched source
> - upstream: upstream source
Suppose the following workflow:
- upstream version X.Y
- master branch based on X.Y
- patch Z applied on master branch
- upstream branch is updated to (X+1).0
- upstream is merged into master branch and manual intervention is
needed because there are conflicts between changes on upstream side
and patch Z
Now, if upstream want to get patch Z, he can :
- get patch Z for version X.Y
- get patch between upstream (X+1).0 and master (X+1).0 containing
patch Z and other stuff
While git allows to keep track of modifications, it is difficult for
upstream (or some other people) to review a precise patch. Or maybe you
rebase master branch on the upstream one (which would be great to see
watch patches are applying to upstream but will lead to difficulties
when tracking master branch)?
--
Don't comment bad code - rewrite it.
- The Elements of Programming Style (Kernighan & Plauger)
pgpk4diN0Vp0H.pgp
Description: PGP signature
