[Mesa-dev] Bringing changes in 7.8 branch to master?

[Brian Paul]

Ian Romanick wrote:
> -----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?

I'd use whatever combination of cherry picks and "just copy the files 
over and commit" is easiest.

-Brian