From: Jim D. <ji...@du...> - 2012-11-06 02:48:26
|
I have create a github account for myself, jduda. I forked the hollie/misterhouse repository to my own. I did a git clone git://gthub.om/jduda/misterhouse.git mh-git I then cd mh-git I then did git checkout -b insteon I then copied in some my modified files from my svn workspace in preparation for going live on my git clone. I do a git status: I appear to be on the insteon branch. /home/misterhouse/mh-git linux> git status # On branch insteon # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: code/common/android_server.pl # modified: code/common/weather_iB_OWW_client.pl # modified: lib/Base_Item.pm # modified: lib/Device_Item.pm # modified: lib/Light_Item.pm # modified: lib/Owfs_Item.pm # modified: lib/Telephony_Interface.pm # modified: web/ia5/outside/menu.shtml # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # lib/OW.pm But when I attempt to restart misterhouse, things go wrong: I get: 11/05/12 09:42:46 PM Reading /home/misterhouse/mh.private.ini,/home/misterhouse/mh.local.private.ini and mh.ini Voice names: us1_mbrola, us2_mbrola, us3_mbrola Read 18 entries from /home/misterhouse/data/pronouncable_words.list 11/05/12 09:42:46 PM Reading 2 .mht table files: insteon.mht x10_items.mht 11/05/12 09:42:46 PM Translating insteon.mht -> /home/misterhouse/code/insteon.mhp 11/05/12 09:42:46 PM Initialized read_table_A.pl Unrecognized .mht entry: INSTEON_APPLIANCELINC, 11.49.39, office_lights Unrecognized .mht entry: INSTEON_APPLIANCELINC, 0E.96.B6, living_room_window Unrecognized .mht entry: INSTEON_APPLIANCELINC, 0F.EF.37, living_room_wall I appears to me like I'm running the code on the master trunk and not the insteon branch. What did I do wrong? Thanks, Ji |
From: John <jo...@to...> - 2012-11-06 04:07:56
|
On 11/05/12 20:48, Jim Duda wrote: [snip] > I appears to me like I'm running the code on the master trunk and not > the insteon branch. [snip] Doesn't explain what you are seeing but did you leave out a step where you tell mh what dir it is running from as part of startup? I am not sure how you started mh up. I ask because you mention the mh-git directory and you probably were not running out of the before. John |
From: Jim D. <ji...@du...> - 2012-11-06 14:28:56
|
John <john <at> tonebridge.com> writes: > [snip] > > Doesn't explain what you are seeing but did you leave out a step where > you tell mh what dir it is running from as part of startup? I am not > sure how you started mh up. I use a link to switch between my directories. lrwxrwxrwx 1 jduda users 15 Nov 5 21:46 mh -> mh-svn-insteon/ drwxr-xr-x 10 jduda users 4096 Nov 5 21:09 mh-git drwxr-xr-x 10 jduda users 4096 Oct 28 13:05 mh-svn-insteon drwxrwxr-x 10 jduda users 4096 Feb 4 2012 mh-svn-trunk I had the link pointing to mh-git when I made my git attempt. > > I ask because you mention the mh-git directory and you probably were not > running out of the before. > I think something went wrong with the Insteon Branch maybe. In my mh-git/lib directory, I don't have the Insteon directory. inux> cd mh-git/lib linux> l -d Insteon* -rw-r--r-- 1 jduda users 64788 Nov 5 21:09 Insteon_Device.pm -rw-r--r-- 1 jduda users 5294 Nov 5 21:09 Insteon_Irrigation.pm -rw-r--r-- 1 jduda users 15068 Nov 5 21:09 Insteon_Link.pm -rw-r--r-- 1 jduda users 45198 Nov 5 21:09 Insteon_PLM.pm -rwxr-xr-x 1 jduda users 13250 Nov 5 21:09 Insteon_Thermostat.pm However, in the mh-svn-insteon, I do: linux> l -d Insteon* drwxr-xr-x 3 jduda users 4096 Oct 28 12:39 Insteon -rw-r--r-- 1 jduda users 5293 Jan 6 2011 Insteon_Irrigation.pm -rw-r--r-- 1 jduda users 30638 Oct 28 12:39 Insteon_PLM.pm -rwxr-xr-x 1 jduda users 19425 Mar 11 2012 Insteon.pm -rwxr-xr-x 1 jduda users 13250 Dec 21 2010 Insteon_Thermostat.pm The Insteon_PLM.pm files in mh-git and mh-svn-insteon are wildly different. Since I did a "git checkout insteon", shouldn't I have expected the lib/Insteon directory to show up, since it's part of the original svn insteon-branch? On a follow up question about svn to git transition. With svn, I would push changes to both the svn trunk and svn insteon-branch. With git, do I have to continue to do that? With git, doesn't the insteon branch only have the stuff which is specific to what Gregg did for the new Insteon design? So, if I have a change which applies to both, do I only need to push into into the master and the change will show up in master and insteon? I appreciate your patience while I get comfortable with git. I'm reading documentation and how-tos on the git site. Thanks, Jim > John > > ------------------------------------------------------------------------------ > 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 > > |
From: John <jo...@to...> - 2012-11-06 15:10:00
|
On Nov 6, 2012 8:31 AM, "Jim Duda" <ji...@du...> wrote: [snip] > Since I did a "git checkout insteon", shouldn't I have expected the lib/Insteon > directory to show up, since it's part of the original svn insteon-branch? Yes. You can also browse the repository in github and see the dir there. I can go through the steps again tonight. John |
From: Jim D. <ji...@du...> - 2012-11-06 15:08:17
|
Jim Duda <jim <at> duda.tzo.com> writes: > > I think something went wrong with the Insteon Branch maybe. > In my mh-git/lib directory, I don't have the Insteon directory. > > inux> cd mh-git/lib > linux> l -d Insteon* > -rw-r--r-- 1 jduda users 64788 Nov 5 21:09 Insteon_Device.pm > -rw-r--r-- 1 jduda users 5294 Nov 5 21:09 Insteon_Irrigation.pm > -rw-r--r-- 1 jduda users 15068 Nov 5 21:09 Insteon_Link.pm > -rw-r--r-- 1 jduda users 45198 Nov 5 21:09 Insteon_PLM.pm > -rwxr-xr-x 1 jduda users 13250 Nov 5 21:09 Insteon_Thermostat.pm > > However, in the mh-svn-insteon, I do: > linux> l -d Insteon* > drwxr-xr-x 3 jduda users 4096 Oct 28 12:39 Insteon > -rw-r--r-- 1 jduda users 5293 Jan 6 2011 Insteon_Irrigation.pm > -rw-r--r-- 1 jduda users 30638 Oct 28 12:39 Insteon_PLM.pm > -rwxr-xr-x 1 jduda users 19425 Mar 11 2012 Insteon.pm > -rwxr-xr-x 1 jduda users 13250 Dec 21 2010 Insteon_Thermostat.pm > > The Insteon_PLM.pm files in mh-git and mh-svn-insteon are wildly different. > If I navigate to hollie/misterhouse, set the branch to insteon, and navigate to the lib directory, I see the Insteon directory. So, obviously I did something wrong in my initial git setup. I started from scratch, went back and read the wiki again for instructions. Here are my commands: 150 10:02 git clone git://github.com/jduda/misterhouse.git mh-git 151 10:03 cd mh-git 152 10:04 git checkout -b insteon 154 10:04 cd lib 155 10:04 l -d Insteon* linux> l -d Insteon* -rw-r--r-- 1 jduda users 64788 Nov 6 10:03 Insteon_Device.pm -rw-r--r-- 1 jduda users 5294 Nov 6 10:03 Insteon_Irrigation.pm -rw-r--r-- 1 jduda users 15068 Nov 6 10:03 Insteon_Link.pm -rw-r--r-- 1 jduda users 45198 Nov 6 10:03 Insteon_PLM.pm -rwxr-xr-x 1 jduda users 13250 Nov 6 10:03 Insteon_Thermostat.pm No Insteon directory, required for insteon branch operation. What am I doing wrong? Thanks, Jim |
From: John <jo...@to...> - 2012-11-06 15:39:36
|
Looks like when I did this originally I didn't follow the instructions :) Delete the insteon branch you created locally (maybe not needed) and try this: git branch insteon origin/insteon Must have got that off the same stackoverflow question I got it from this time. Note: I am git beginner as well so hopefully this approach is right foundation. |
From: Jim D. <ji...@du...> - 2012-11-06 15:54:51
|
John <john <at> tonebridge.com> writes: > Looks like when I did this originally I didn't follow the instructions :) > Delete the insteon branch you created locally (maybe not needed) and try this: > git branch insteon origin/insteon > Must have got that off the same stackoverflow question I got it from this time. > Note: I am git beginner as well so hopefully this approach is right foundation. > John, Okay, thanks, that resolved my problem. Afterwards, I did a git checkout insteon to switch over to that branch. I will try going live again tonight. Can you answer my other question too? With svn, I would push changes to both the svn trunk and svn insteon-branch. With git, do I have to continue to do that? With git, doesn't the insteon branch only have the stuff which is specific to what Gregg did for the new Insteon design? So, if I have a change which applies to both, do I only need to push into into the master and the change will show up in master and insteon? Thanks, Jim > > ------------------------------------------------------------------------------ > 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 > > |
From: John <jo...@to...> - 2012-11-06 17:28:52
|
On Nov 6, 2012 9:56 AM, "Jim Duda" <ji...@du...> wrote: > Can you answer my other question too? > > With svn, I would push changes to both the svn trunk and svn insteon-branch. > > With git, do I have to continue to do that? With git, doesn't the insteon > branch only have the stuff which is specific to what Gregg did for the new > Insteon design? So, if I have a change which applies to both, do I only need to > push into into the master and the change will show up in master and insteon? I cannot answer that. I am curious as well. I can work with it tonight but I bet someone with more git experience can answer conclusively. |
From: Lieven H. <li...@li...> - 2012-11-06 18:32:45
|
Hello Jim, maybe a very short extra info on the branch problem you had: what you did was to checkout the repo, and create in your local working copy a branch called 'insteon'. This branch originated from your working copy (which was in 'master' branch) and hence did not contain any of the files that are in the remote insteon branch. When you want to work on and track a remote branch you indeed need to tell the git tool where the remote branch lives. Then on your other wuestion: Op 6-nov.-2012, om 16:54 heeft Jim Duda <ji...@du...> het volgende geschreven: > > With svn, I would push changes to both the svn trunk and svn insteon-branch. > With git you can do the same. Another option would be to track the insteon branch from the master branch and select what commits we want to apply to it (called cherry-picking). But to be honest: I would not start doing that because I then do not know what will happen when we want to merge insteon back into the master branch. We could setup an experiment to see how this is handled, but I would do that on a separate repository and not on the MH one. If I understood it correctly from other mails on the list, people developing on insteon expect to be able to merge back to master in the near future. So I think the safest/easiest way to go is to commit global changes both to master and to insteon. When you create a pull request you can select what branch to post it to. So you can create one for insteon (which will be selected by default) and one for master (by selecting that branch in the web interface when creating the pull request). > With git, do I have to continue to do that? With git, doesn't the insteon > branch only have the stuff which is specific to what Gregg did for the new > Insteon design? So, if I have a change which applies to both, do I only need to > push into into the master and the change will show up in master and insteon? > No, the insteon branch is a full branch that originated from master and that is currently 31 commits behind master and 153 commits ahead of the master branch. Changes in one branch are not automatically added to the other. Another note: please do create a so-called feature branch if you want to commit changes. This eases the creation of pull requests and eases the merging process. Creating a so-called feature branch is very similar to what you already did in your first experiment. You checkout the repository and select the branch you want to work on. Then you create a local 'feature branch' in which you develop your fix/feature. After all is done you commit the changes to that branch and push the branch to the github repo wou'er working on. In the web interface you can then create the pull request. So please don't checkout insteon and start adding files. Instead checkout insteon, create a feature branch and add the files to that. As an example, these are the commands I used yesterday to fix the xPL_Items.pm issue. > git clone gi...@gi...:hollie/misterhouse.git at this time I'm at the 'master' branch > git branch fix_issue_3 > git checkout fix_issue_3 make changes > git stage <changes> > git commit In the editor that appears, enter a first line with a short description of the change, then an empty line and then a longer description. This will be useful when creating the pull request later > git push origin fix_issue_3 Then in the web interface navigate to the commit, click the 'create pull request' button and the next screen will be auto-filled in with the info you put in the commit message. Title will be the first line of the commit, body will be the content you added to the commit message after the empty line. That's it. If you want to apply the patch locally to your working branch (master in my case, or insteon in your case) then do git checkout <working branch> git merge fix_issue_3 Hope this helps. Kind regards, Lieven. |
From: Jim D. <ji...@du...> - 2012-11-06 19:19:15
|
Lieven Hollevoet <lieven <at> lika.be> writes: > As an example, these are the commands I used yesterday to fix the xPL_Items.pm issue. > > > git clone git <at> github.com:hollie/misterhouse.git > at this time I'm at the 'master' branch > > git branch fix_issue_3 > > git checkout fix_issue_3 > make changes > > git stage <changes> > > git commit > In the editor that appears, enter a first line with a short description of the change, then an empty line and > then a longer description. This will be useful when creating the pull request later > > git push origin fix_issue_3 Lieven, Thanks for helping me through this. I did the following in my insteon branch. 128 14:05 git branch android_callerid 129 14:05 get checkout android_callerid made my changes (1 file change) 133 14:06 git stage code/common/android_server.pl (1 file staged and ready for commit) 136 14:08 git commit filled in the commit description as you described 138 14:11 git push origin android_callerid linux> git push origin android_callerid fatal: remote error: You can't push to git://github.com/jduda/misterhouse.git Use gi...@gi...:jduda/misterhouse.git What did I miss? Thanks, Jim |
From: Lieven H. <li...@li...> - 2012-11-06 19:30:18
|
Hello Jim, Op 6-nov.-2012, om 20:18 heeft Jim Duda <ji...@du...> het volgende geschreven: > Lieven, > > Thanks for helping me through this. > You're welcome! > I did the following in my insteon branch. > > 128 14:05 git branch android_callerid > 129 14:05 get checkout android_callerid > made my changes (1 file change) > 133 14:06 git stage code/common/android_server.pl > (1 file staged and ready for commit) > 136 14:08 git commit > filled in the commit description as you described > 138 14:11 git push origin android_callerid > > linux> git push origin android_callerid > fatal: remote error: > You can't push to git://github.com/jduda/misterhouse.git > Use gi...@gi...:jduda/misterhouse.git > > What did I miss? > I guess you checked out your local copy from the read-only URL. You should checkout from the SSH URL or the HTTP URL to be able to push to the repo. But do not fear, changing the remote repository URL is as easy as: git remote set-url origin gi...@gi...:jduda/misterhouse.git After this command 'git remote show origin' should show you the URL has changed to gi...@gi... and you should be able to push changes to the repo. Kind regards, Lieven. |
From: Jim D. <ji...@du...> - 2012-11-06 19:53:11
|
> git remote set-url origin git <at> github.com:jduda/misterhouse.git > Now when I attempt to push, I get: linux> git remote set-url origin gi...@gi...:jduda/misterhouse.git linux> git push origin android_callerid The authenticity of host 'github.com (207.97.227.239)' can't be established. RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. Are you sure you want to continue connecting (yes/no)? yes Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of known hosts. Permission denied (publickey). fatal: The remote end hung up unexpectedly Is there some other procedure I need to do to setup my public key? Jim |
From: Lieven H. <li...@li...> - 2012-11-06 19:55:53
|
Op 6-nov.-2012, om 20:52 heeft Jim Duda <ji...@du...> het volgende geschreven: > >> git remote set-url origin git <at> github.com:jduda/misterhouse.git >> > Now when I attempt to push, I get: > > linux> git remote set-url origin gi...@gi...:jduda/misterhouse.git > linux> git push origin android_callerid > The authenticity of host 'github.com (207.97.227.239)' can't be established. > RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. > Are you sure you want to continue connecting (yes/no)? yes > Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of > known hosts. > Permission denied (publickey). > fatal: The remote end hung up unexpectedly > > Is there some other procedure I need to do to setup my public key? > Yes, there is. It is documented here: https://help.github.com/articles/generating-ssh-keys I'm adding this info to http://misterhouse.wikispaces.com/GitHub+Access too. Kind regards, Lieven. |
From: John <jo...@to...> - 2012-11-06 20:03:41
|
In addition to ssh, ssl can be used for read/write access: https://help.github.com/articles/which-remote-url-should-i-use John |
From: Jim D. <ji...@du...> - 2012-11-06 20:20:53
|
Lieven Hollevoet <lieven <at> lika.be> writes: > > > Op 6-nov.-2012, om 20:52 heeft Jim Duda <jim <at> duda.tzo.com> het volgende geschreven: > > > > >> git remote set-url origin git <at> github.com:jduda/misterhouse.git > >> > > Now when I attempt to push, I get: > > > > linux> git remote set-url origin git <at> github.com:jduda/misterhouse.git > > linux> git push origin android_callerid > > The authenticity of host 'github.com (207.97.227.239)' can't be established. > > RSA key fingerprint is 16:27:ac:a5:76:28:2d:36:63:1b:56:4d:eb:df:a6:48. > > Are you sure you want to continue connecting (yes/no)? yes > > Warning: Permanently added 'github.com,207.97.227.239' (RSA) to the list of > > known hosts. > > Permission denied (publickey). > > fatal: The remote end hung up unexpectedly > > > > Is there some other procedure I need to do to setup my public key? > > > > Yes, there is. It is documented here: > https://help.github.com/articles/generating-ssh-keys > > I'm adding this info to http://misterhouse.wikispaces.com/GitHub+Access too. Okay, I added my keys. But, I think I check out again with https. I was able to do the push. git push origin android_callerid Enter passphrase for key '/home/jduda/.ssh/id_rsa': Counting objects: 9, done. Delta compression using up to 2 threads. Compressing objects: 100% (5/5), done. Writing objects: 100% (5/5), 1.13 KiB, done. Total 5 (delta 4), reused 0 (delta 0) To gi...@gi...:jduda/misterhouse.git * [new branch] android_callerid -> android_callerid Then I did: 162 15:11 git checkout insteon 163 15:12 git merge android_callerid Now I'm trying to generate the pull requests. I cannot find the commit in my github/jduda/misterhouse. I changed the branch to android_callerid. I get oops android_callerid is already up-to-date insteon. Try a different branch? What did I do wrong now? Regards, Jim |
From: Lieven H. <li...@li...> - 2012-11-06 20:29:58
|
Op 6-nov.-2012, om 21:20 heeft Jim Duda <ji...@du...> het volgende geschreven: > > Okay, I added my keys. But, I think I check out again with https. > Why do you think so? I see below you push to gi...@gi..., looks fine. > I was able to do the push. > > git push origin android_callerid > Enter passphrase for key '/home/jduda/.ssh/id_rsa': > Counting objects: 9, done. > Delta compression using up to 2 threads. > Compressing objects: 100% (5/5), done. > Writing objects: 100% (5/5), 1.13 KiB, done. > Total 5 (delta 4), reused 0 (delta 0) > To gi...@gi...:jduda/misterhouse.git > * [new branch] android_callerid -> android_callerid > Yes, I can see that in your fork. > Then I did: > 162 15:11 git checkout insteon > 163 15:12 git merge android_callerid > This means that you have applied the changes to your local repository. Fine by me. > Now I'm trying to generate the pull requests. I cannot find the commit > in my github/jduda/misterhouse. I changed the branch to android_callerid. > I get oops android_callerid is already up-to-date insteon. Try a different > branch? > > What did I do wrong now? > You did not do anything wrong according to me. You merged in your local account the changes from the branch to the insteon branch. Now to create the pull request I think you should navigate to https://github.com/jduda/misterhouse/commit/ba265d553bf131e7b06f9d98b403de277d0c1159 and click the 'create pull request' button that appears on the page (at least it should, I cannot see it because I'm not logged into your account of course). Kind regards, Lieven |
From: Lieven H. <li...@li...> - 2012-11-06 20:32:24
|
Op 6-nov.-2012, om 21:20 heeft Jim Duda <ji...@du...> het volgende geschreven: > Now I'm trying to generate the pull requests. I cannot find the commit > in my github/jduda/misterhouse. I changed the branch to android_callerid. > I get oops android_callerid is already up-to-date insteon. Try a different > branch? > > What did I do wrong now? > Jim, some more info on the pull request generation is documented here: https://help.github.com/articles/using-pull-requests Kind regards, Lieven. |
From: John <jo...@to...> - 2012-11-06 23:14:12
|
On 11/06/12 17:06, Jim Duda wrote: > Jim Duda <jim <at> duda.tzo.com> writes: > >> >> How come I don't see the same think in the fork jduda/misterhouse? >> >> I see the two different branches I pushed (android_callerid and >> add_android_callerid_master). Why don't I see the same change in my forked >> master and insteon? >> > > Lieven. > > I think what I am missing, and you have been trying to explain to me, is > that I have to constantly keep my "fork" in sync somehow with your > hollie/misterhouse. I am under the naive impression that the sync between > hollie and my fork is automatic. I'm now thinking that's not the case. > This seems like a nightmare to me. I'm used to working out of one sandbox > and doing a simple svn update when I want to sync up with the mother-ship. > > Can you please update the wiki on how we are to keep our github forks > in-sync with your hollie/misterhouse master and insteon branches? Sounds like if you aren't getting the value from the fork you can take him up on offer to have you added to make direct updates to top repository. You have my vote! :) John |
From: Marc M. <ma...@me...> - 2012-11-07 14:48:19
|
On Tue, Nov 06, 2012 at 05:14:04PM -0600, John wrote: > > Can you please update the wiki on how we are to keep our github forks > > in-sync with your hollie/misterhouse master and insteon branches? > > Sounds like if you aren't getting the value from the fork you can take > him up on offer to have you added to make direct updates to top > repository. You have my vote! :) Same here. A fork is just a playground to test stuff and have others look at it. Active developers with an existing history in the svn tree, that means you Jim :) should not have to go through a fork to check in routine code or stuff that's not likely to break people. Patches meant for the main tree can go in the main branch directly and yes you have my vote too to be a developer on the main tree :) Marc -- "A mouse is a device used to point at the xterm you want to type in" - A.S.R. Microsoft is to operating systems .... .... what McDonalds is to gourmet cooking Home page: http://marc.merlins.org/ |
From: Jim D. <ji...@du...> - 2012-11-07 15:30:04
|
> > Same here. A fork is just a playground to test stuff and have others look at > it. Active developers with an existing history in the svn tree, that means > you Jim :) should not have to go through a fork to check in routine code or > stuff that's not likely to break people. > I think I'm now comfortable enough with git and I can be added to the list of maintainers. I will continue to use my fork while I gain confidence. Regards, Jim |
From: Lieven H. <li...@li...> - 2012-11-07 19:26:13
|
Jim, Op 7-nov.-2012, om 16:24 heeft Jim Duda <ji...@du...> het volgende geschreven: >> >> Same here. A fork is just a playground to test stuff and have others look at >> it. Active developers with an existing history in the svn tree, that means >> you Jim :) should not have to go through a fork to check in routine code or >> stuff that's not likely to break people. >> > > I think I'm now comfortable enough with git and I can be added to the list of > maintainers. I will continue to use my fork while I gain confidence. > Done! You can apply the same method as you're used to on your fork: branch, develop and commit. If you want people to review, generate a pull request and collect feedback. When ready merge feature branch into master and pull from master into insteon. Kind regards, Lieven. |
From: Jim D. <ji...@du...> - 2012-11-06 20:47:27
|
Lieven Hollevoet <lieven <at> lika.be> writes: > > You did not do anything wrong according to me. You merged in your local account the changes from the branch to > the insteon branch. Now to create the pull request I think you should navigate to > > https://github.com/jduda/misterhouse/commit/ba265d553bf131e7b06f9d98b403de277d0c 1159 > > and click the 'create pull request' button that appears on the page (at least it should, I cannot see it > because I'm not logged into your account of course). Okay, thank you. I don't know why, but the first time I went looking, I couldn't find it. But after you gave me the link, I was able to go back and find on my own. I think I did a pull request for both the master and insteon branches, but I'm not fully sure. For some reason, the description didn't fill in on one of the requests, I didn't catch that at first. I believe I have done one round of git. To be honest, I find this to be a lot of work. But, I do understand how this will make it easier for others to contribute where SVN is a stumbling block. I'm sure it will get easier as I get more practice. I see that you have accepted my changes. Is it now the proper time to delete the android_callerid branch from my local git repository? Thanks for you help. Regards, Jim |
From: Lieven H. <li...@li...> - 2012-11-06 20:55:27
|
Hi Jim, Op 6-nov.-2012, om 21:47 heeft Jim Duda <ji...@du...> het volgende geschreven: > I think I did a pull request for both the master and insteon branches, but I'm > not fully sure. For some reason, the description didn't fill in on one of > the requests, I didn't catch that at first. > Yes, noticed them. The insteon pull request I accepted, the one for the master branch did not work as as I had hoped it would be so I had to refuse it. I'm afraid for the time being we will need to ask you to apply the changes you make to the two branches as you did with SVN... > I believe I have done one round of git. To be honest, I find this to be > a lot of work. But, I do understand how this will make it easier for others > to contribute where SVN is a stumbling block. I'm sure it will get easier > as I get more practice. I'm sure it will :-) By the way, if you're regularly contributing code and you feel confident enough to use git, I can/will add you as contributor to the main fork (on my account). Then you clone this repo, make a branch, commit and push the change back to github in one operation. No need to go for a pull request in that case. Just let me know if you want this type of access. > > I see that you have accepted my changes. Is it now the proper time to delete > the android_callerid branch from my local git repository? > As stated, only for the insteon branch and not for the master. I would like to ask you if you would see it feasible to make the same change on the master branch? > Thanks for you help. Thanks for you effort and the sharing of your code! Kind regards, Lieven. |
From: Lieven H. <li...@li...> - 2012-11-06 21:10:12
|
Jim, I noticed the new pull request. I think it is identical to the one you generated previously and it contains all changes between insteon and master as you can see here: https://github.com/hollie/misterhouse/pull/8 To create the new pull request you'll need to perform these operation on your computer: git checkout master git branch add_android_callerid_master git checkout add_android_callerid_master make changes git stage git commit git push origin add_android_callerid_master Kind regards, Lieven. Op 6-nov.-2012, om 21:47 heeft Jim Duda <ji...@du...> het volgende geschreven: > Lieven Hollevoet <lieven <at> lika.be> writes: > >> >> You did not do anything wrong according to me. You merged in your local > account the changes from the branch to >> the insteon branch. Now to create the pull request I think you should navigate > to >> >> > https://github.com/jduda/misterhouse/commit/ba265d553bf131e7b06f9d98b403de277d0c > 1159 >> >> and click the 'create pull request' button that appears on the page (at least > it should, I cannot see it >> because I'm not logged into your account of course). > > Okay, thank you. I don't know why, but the first time I went looking, I > couldn't find it. But after you gave me the link, I was able to go back > and find on my own. > > I think I did a pull request for both the master and insteon branches, but I'm > not fully sure. For some reason, the description didn't fill in on one of > the requests, I didn't catch that at first. > > I believe I have done one round of git. To be honest, I find this to be > a lot of work. But, I do understand how this will make it easier for others > to contribute where SVN is a stumbling block. I'm sure it will get easier > as I get more practice. > > I see that you have accepted my changes. Is it now the proper time to delete > the android_callerid branch from my local git repository? > > Thanks for you help. > > Regards, > > Jim > > > > ------------------------------------------------------------------------------ > 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 > |
From: Jim D. <ji...@du...> - 2012-11-06 21:08:42
|
Lieven Hollevoet <lieven <at> lika.be> writes: > Yes, noticed them. The insteon pull request I accepted, the one for the master branch did not work as as I had > hoped it would be so I had to refuse it. I'm afraid for the time being we will need to ask you to apply the > changes you make to the two branches as you did with SVN... I tried again, but the screen didn't fill in like it did for the one I did on insteon. I will go through the process again with the master. I did another fresh clone from my fork using https. I did another: git branch insteon origin/insteon I don't see the changes I submitted. Is there something I need to now do in order to sync up my fork with your insteon branch? Regards, Jim |