[Mesa-dev] so the development model is working?
idr at freedesktop.org
Fri Apr 30 13:14:37 PDT 2010
-----BEGIN PGP SIGNED MESSAGE-----
Bridgman, John wrote:
> Dave's comments implied that there is a policy against fixing bugs in
> master then cherry picking 'em to stable; your comments implied
> master-first plus cherry pick is OK but you feel that fixing in
> stable and merging back to master is a *better* way of working.
> Is it fair to say that if a developer is working in master and
> notices a potential bug fix then it's OK to fix in master and
> cherry-pick that fix to one or more stable branches afterwards, but
> if the "primary task" is fixing a bug (particularly a big discovered
> in stable) then fixing first in the stable branch is preferred ?
Mixing cherry-picking and merging is bad because the same commit will
end up in the log multiple times. If you commit to master, cherry-pick
to 7.8, and merge back to master, the commit will appear in the log of
master two or three times. This is confusing at best.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
-----END PGP SIGNATURE-----
More information about the mesa-dev