Mailing Lists: Apple Mailing Lists
Image of Mac OS face in stamp
 
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Baby steps towards master-sync


On Nov 19, 2007, at 6:18 PM, Jeremy Huddleston wrote:
git-rebase 96c637350d1117d18a10ca3de40814b506c8ffc3 xorg-server-1.2- apple

Ok, so I did this git-rebase followed by a git-push to merge the changes into our git branch, and the resulting tree is correct, but the log is a bit... well... weird. If you look at gitweb ( http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=shortlog;h=xorg-server-1.2-apple ), you'll see our commits twice. Once when they were originally committed, and again dated 15 hours ago (the time matching my rebase locally).

Does anyone know why this is happening? Can someone explain to me what I did wrong, what I should've done or how to clean it up? I know our tree is in a consistent state, but I'd really prefer a clean changelog and want to know how to do it "the right way."

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

_______________________________________________
Do not post admin requests to the list. They will be ignored.
X11-users mailing list      (email@hidden)
Help/Unsubscribe/Update your Subscription: http://lists.apple.com/mailman/options/x11-users/email@hidden

This email sent to email@hidden
References: 
 >Building Xquartz from source (From: Harald Hanche-Olsen <email@hidden>)
 >Re: Building Xquartz from source (From: "Nathaniel Gray" <email@hidden>)
 >Re: Building Xquartz from source (From: Harald Hanche-Olsen <email@hidden>)
 >Re: Building Xquartz from source (From: Harald Hanche-Olsen <email@hidden>)
 >Re: Building Xquartz from source (From: Ben Byer <email@hidden>)
 >Re: Building Xquartz from source (From: Jeremy Huddleston <email@hidden>)
 >Baby steps towards master-sync (Was: Re: Building Xquartz from source) (From: Jeremy Huddleston <email@hidden>)
 >Re: Baby steps towards master-sync (Was: Re: Building Xquartz from source) (From: Jeremy Huddleston <email@hidden>)



Visit the Apple Store online or at retail locations.
1-800-MY-APPLE

Contact Apple | Terms of Use | Privacy Policy

Copyright © 2007 Apple Inc. All rights reserved.