On 23.07.2011, at 08:57, Blue Swirl wrote: > On Sat, Jul 23, 2011 at 3:07 AM, Alexander Graf <ag...@suse.de> wrote: >> Great. Thanks. Instead of just pulling my xen-next tree which had an >> outstanding pull request for days now you apply Avi's patch which obviously >> conflicts with my current queue, so I have to rebase it again. > > Your patch carried the tree with it, while Avi's was only a single > patch fixing specifically the broken build. Given the release > schedule, I didn't want to pull large patch sets anymore.
I see :). Anthony sounded quite contrary to that, specifically stating that pull requests that are issued until Friday get in. Oh well - deadline is past now and it's not like the other patches were important to have in 0.15 either. > >> Not everyone is as privileged as you. Some of us have to wait for Anthony or >> someone else to pull their trees. We can't just commit :(. > > I don't think rebasing could be avoided even if there were 2000 > developers with commit rights. > >> Either way - leave the patch in. I'll rebase my tree. > > Thank you for your work. If you think Avi's patch has some huge > problems, you could also revert it as the first step. Avi's patch is fine. In fact, it might even be better than the one I had in my tree. It was a mere thing of timing. Thanks a lot for caring about broken builds btw :). Alex
