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 11:40 PM, Nathaniel Gray wrote:

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.

With git, everybody has their own repository. A CVS checkout only gives you a local copy and enough bookkeeping metadata to commit back to the (one and only) repository. A git clone makes a local repository which is a copy (clone) of some other repository. With git, you can (and normally do) commit to your local repository. You only need commit rights at the shared repository if you want to then push your local commits to it.


So, if you want to "do some light hacking", you presumably don't need commit access to the fd.o repository, you can just work with your local one. The general pattern after that, to get recent changes from the fd.o repository to your own, is to do:

git fetch origin && git rebase origin/<name of head>

(I'm assuming you're using git >= v1.5. If you're using an earlier version of git, your cloned repository is likely to have different names for things.)

I hope that's helpful.

Cheers,
Ken

_______________________________________________
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>)
 >Re: Baby steps towards master-sync (From: Jeremy Huddleston <email@hidden>)
 >Re: Baby steps towards master-sync (From: "Nathaniel Gray" <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.