Re: Baby steps towards master-sync
Re: Baby steps towards master-sync
- Subject: Re: Baby steps towards master-sync
- From: Jeremy Huddleston <email@hidden>
- Date: Tue, 20 Nov 2007 01:04:51 -0800
Hi Nate,
I was just sending patches to Ben until he got tired of committing my
changes, so I got a freedesktop.org account with git commit access.
All of the changes I'm making are right in the xorg-server-1.2-apple
branch. I think the best course of action will be to keep xorg-
server-1.2-apple based off of the 1.2/1.3 branch (1.2 and 1.3 are the
same branch, but the minor version bump was because of an ABI chance
for drivers which doesn't concern us). I'll probably start a xorg-
server-1.4-apple branch based off of server-1.4-branch and use git's
cherry-picking to apply our recent patches to that branch (unless
someone can tell me a better way to do that... git gives me headaches).
I'll then make sure changes goto both of the 1.2/1.4 branches with
this cherry-picking. xorg-server-1.2-apple will be "stable" and xorg-
server-1.4-apple will be "developmemnt" in the sense that I believe
1.4 has some regressions that we will need to address, but most of our
changes should be applied to both branches. Once we eliminate the
regressions, we can switch to xorg-server-1.4-apple for stable and
merge (meaning cherry-pick, since git-merge actually does something
else) all of our changes into master and develop on the master branch.
--Jeremy
On Nov 19, 2007, at 9:40 PM, Nathaniel Gray wrote:
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 -->
_______________________________________________
Do not post admin requests to the list. They will be ignored.
X11-users mailing list (email@hidden)
This email sent to email@hidden