[PULL] 1.12 fix queue

Daniel Stone daniel at fooishbar.org
Wed Jan 11 15:38:29 PST 2012


On 11 January 2012 22:54, Keith Packard <keithp at keithp.com> wrote:
> I can easily do that. Now, the only question is one of names. I'm not
> sure I like changing where the release is done; keeping it on master
> makes things straightforward (at least for me, and perhaps for
> others?). The pending changes could be in a 'next' branch. Each time I
> merged patches to master I could either:
>  a) merge master->next
>  b) rebase next on top of master
> a) will result in a ton of merge commits on next, but would keep the
> temporal ordering of patches 'correct'. b) will make 'next' look a lot
> cleaner, but lose ordering information.

I don't mind which, but if there's a single blessed tree I can submit
my extmod/unexport changes to -- and get them merged so I don't have
to constantly rebase -- I'd be pretty happy about that.  And some
other invasive changes, too.


More information about the xorg-devel mailing list