[Mesa-dev] Bringing changes in 7.8 branch to master?
Ian Romanick
idr at freedesktop.org
Thu Jun 17 11:33:26 PDT 2010
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
So... here's a question. There are some files in the 7.8 branch that
have changes that are NOT cherry-picks from master (all in docs/).
What's the best way to sync those changes in the new development model?
docs/relnotes-7.8.2.html
docs/news.html
docs/download.html
docs/devinfo.html
docs/lists.html
The changes in download.html and devinfo.html should have been made on
master first. That was my mistake. I think the changes in lists.html
are on master already, but I haven't checked.
Cherry-pick from the branch? There are quite a few changes to
docs/relnotes-7.8.2.html, so that is likely to be tedious.
Other options?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkwaanUACgkQX1gOwKyEAw/CsgCeICKVWw6avtybcd33Ve2m+nUr
fM8An3l32JsXR4LeTkIRzRL40y+OlgQm
=qvGv
-----END PGP SIGNATURE-----
More information about the mesa-dev
mailing list