Re: [mh] Git Insteon Branch Questions

[Jim D. <ji...@du...>]

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
> 
>