Re: Baby steps towards master-sync (Was: Re: Building Xquartz from source)
Re: Baby steps towards master-sync (Was: Re: Building Xquartz from source)
- Subject: Re: Baby steps towards master-sync (Was: Re: Building Xquartz from source)
- From: Jeremy Huddleston <email@hidden>
- Date: Mon, 19 Nov 2007 18:18:36 -0800
On Nov 19, 2007, at 3:01 AM, Jeremy Huddleston wrote:
Ok, so I spent a bit of time today learning about git and all its
wonderful features (of which usability is not one). I've learned
how to handle pushing our branch's base (the branch-point) further
along master. As an example, the following command will change our
base to the end of the server-1.2-branch. The long hex string there
is the id for the branch point. You can get it from clicking on
"Distribute hw/xfree86/modes." here http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=shortlog;h=server-1.2-branch
Ok, since I've only heard positive reactions to my suggestion, I went
ahead and pushed the xorg-server-1.2-apple branch forward a bit along
the server-1.3-branch to the end of the 1.2 branch (see my last email
for a diagram of the xserver branches). I've been running Xquartz
with these changes without noticing any regressions for the past day.
Anyone wanting to compile from sources should grab and install the
following updates:
damageproto-1.1.0
randrproto-1.2.1
xf86bigfontproto-1.1.2
Directions for this are on the wiki. If you just want to install
binaries, then there is no need to install these three packages.
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."
Thanks,
Jeremy
_______________________________________________
Do not post admin requests to the list. They will be ignored.
X11-users mailing list (email@hidden)
This email sent to email@hidden