On Nov 19, 2007 9:23 PM, Jeremy Huddleston <email@hidden>
wrote:
On Nov 19, 2007, at 6:18 PM, Jeremy Huddleston wrote:
I did a bit more poking on the web, and it turns out that git-rebase
is just for rebaseing local branches, and using it on upstream
branches can have weird consequences... I'd still like to know how to
clean up the changelog, but for now I guess it's no big deal. I
found
out the "correct" way to do this is by using 'git-merge', so as a
practice, I bumped our branch up to the end of the 1.2/1.3 branch.
Most of the changes in there won't even effect us (mostly in the
xfree86 tree), but these are the ones that pertain to us:
Fixed a Xephyr crash when built as a 64bit binary
CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory
Corruption
Fix for bug #10296: Bug in which extra timers get set/rescheduled - http://bugs.freedesktop.org/show_bug.cgi?id=10296
Fixed a memory leak in os/connection.c
So those fixes will be in Ben's next release.
Jeremy,
I'd like to do some light hacking on the X11 code base but I'm having
a hard time understanding the development model. Are you pushing
changes to the fd.o repository, or do you send patches to Ben? Can
you provide a clue on how I can stay up to date with your changes
while working on my own? I'd be happy to read some docs online if you
have any suggestions.
Thanks,
-n8
--
-- Nathaniel Gray -- Caltech Computer Science ------>
-- Mojave Project -- http://mojave.cs.caltech.edu -->
