[Timothy Spaulding <spaulding@ic...>]

Hi All,

Forgive me if this is short sighted and naïve, but how are the steps below any different than SVN and what we have already? (and please do educate me on the error or my ways).

I read the steps below and it seems just as complicated and convoluted a process as SVN may seem.

SVN:
1. create an SF account and get permission to checkin
2. check out branch (whichever one you want to use/work in)
3. make changes in your local copy
4. test
5. check in changes

Repeats steps 2 through 5 but step 2 being an update to existing copy

I didn't see anything specific on how others can check on a person changes/new feature without either of the following:

1. the changes being committed/pull to a single repository
Or
2. everyone create clones/repositories of individuals whose code they want to investigate (before it is committed to for all to see/use)

I pretty much stayed  out of the debate until the steps appeared and I'll play nice with the other kids in the park <smile>; but for now, I just don't understand.

Tim

-----Original Message-----
From: Lieven Hollevoet [mailto:lieven@...] 
Sent: Saturday, November 03, 2012 5:21 AM
To: The main list for the MisterHouse home automation program
Subject: Re: [mh] MH github port

Hi Tom,

a quick reply before I put some info on the wiki:

0) Initial one-time setup: 
  + create a github account an prepare your environment for committing. This means that you will define your username and email address that will be used when you commit changes.
See https://help.github.com/articles/set-up-git for details.
  + Fork the misterhouse repo I created (single button click in the right upper corner here: https://github.com/hollie/misterhouse)
  + Clone your fork to your local machine with:
git clone git://github.com/tmaclean/misterhouse.git
This automatically sets the origin to your repository

1) create a branch where you will develop your change cd misterhouse git checkout -b feature_x

2) develop, test

3) stage the files you want to commit (this means telling git what files you will commit in the next step) git stage <files>

4) commit. This will commit the changes to your local repo.
git commit -m "Descriptive message here"

5) push it to your github repository
git push origin feature_x

6) create the pull request by navigating to your github web page, clicking on the commit, and then click the 'pull request' button. More details, see here: https://help.github.com/articles/using-pull-requests


Now, as you see, I end up with more steps than you described in your mail, but that is because I detailed everything starting from a user account that never used git. In practice, when you already have the repo forked and setup on your computer, adding a change is as easy as iterating through steps 1 - 6:

$> git checkout -b feature_x
add/modify code
$> git stage <files>
$> git commit -m <descriptive message>
$> git push origin feature_x
create the pull request

Clean and easy. If you want to test this out, feel free to add some info to the README.md and create a pull request. I'll merge it in the main repository then to demo the flow.

A general quick overview of basic git usage can be found here:
http://rogerdudler.github.com/git-guide/

Kind regards,
 Lieven.


Op 3-nov.-2012, om 02:48 heeft Thomas MacLean <tmaclean@...> het volgende geschreven:

> Hi Lieven,
> 
> So, if I want to contribute something .... do I:
> 
> a) Create an account;
> b) fork mh to my account;
> c) set my origin to my account;
> d) commit some changes;
> e) and make a pull request to the main mh?
> 
> Is it easier than that?
> 
> Thanks,
> Tom
> 
> 
> On 2012-10-31, at 8:19 AM, Lieven Hollevoet <lieven@...> wrote:
> 
>> Hello John,
>> 
>> 
>> Op 31-okt.-2012, om 12:36 heeft John <john@...> het volgende geschreven:
>> 
>>> On 10/31/12 05:13, Lieven Hollevoet wrote:
>>> 
>>> [snip]
>>> 
>>>> You can clone the git repository without creating an account and you can use the versioning system on your own system if you want to do that. If you want to share changes, you should indeed create a github account. In that case, just login to your account, surf to the MH repository I linked above and press the 'clone' button. This will create a clone of the repo in your own account that you can work on.
>>> 
>>> [snip]
>>> 
>>> Can you steps to clone?  I see how to clone to my local repository:
>>> 
>> 
>> Yes, a typo from my side. I meant 'fork' indeed.
>> 
>> How to use branches: just clone your own repository to a local drive.
>> 
>>> git clone git@...:<username>/misterhouse.git
>> 
>> This checks out your master branch as a default, if you want the 
>> insteon branch, first get it from the remote repo
>> 
>>> git checkout origin/insteon
>> 
>> And then apply it on your local working copy so you can work on it
>> 
>>> git checkout -b insteon
>> 
>> Switching between master and insteon is simply done with
>>> git checkout master
>> or
>>> git checkout insteon
>> 
>> Creating a new branch from your changes: set your working copy to be 
>> in the branch you want to start from, and then do
>> 
>>> git branch <some_descriptive_name>
>>> git checkout <some_descriptive_name>
>> 
>> And you're all set. Modify, stage, commit, test, iterate, and when done push to origin. Then create the pull request and everything is ready for merging in the main repo.
>> 
>> Kind regards,
>> Lieven.
>> 
>> 
>> ---------------------------------------------------------------------
>> --------- Everyone hates slow websites. So do we.
>> Make your web apps faster with AppDynamics Download AppDynamics Lite 
>> for free today:
>> http://p.sf.net/sfu/appdyn_sfd2d_oct
>> ________________________________________________________
>> To unsubscribe from this list, go to: 
>> http://sourceforge.net/mail/?group_id=1365
> 
> 
> ----------------------------------------------------------------------
> -------- LogMeIn Central: Instant, anywhere, Remote PC access and 
> management.
> Stay in control, update software, and manage PCs from one command 
> center Diagnose problems and improve visibility into emerging IT 
> issues Automate, monitor and manage. Do more in less time with Central 
> http://p.sf.net/sfu/logmein12331_d2d
> ________________________________________________________
> To unsubscribe from this list, go to: 
> http://sourceforge.net/mail/?group_id=1365
> 


------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center Diagnose problems and improve visibility into emerging IT issues Automate, monitor and manage. Do more in less time with Central http://p.sf.net/sfu/logmein12331_d2d
________________________________________________________
To unsubscribe from this list, go to: http://sourceforge.net/mail/?group_id=1365