It is currently Tue Jun 19, 2018 9:38 pm



Post new topic Reply to topic  [ 14 posts ] 
Author Message
 Post subject: I've never done any versioning.
PostPosted: Fri Jun 07, 2013 10:58 pm 
Offline
User avatar

Joined: Sat May 11, 2013 9:52 am
Posts: 304
Location: Over here, doing 'over here' things.
Suggestions or guidelines for setting up GIT (Tortoise GIT or other) for use with Windows 8?

_________________
/me goes off to the corner feeling like Jerry Springer with a mullet.

My O5E candidate: 1982 Honda CX500TC motorcycle.


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sat Jun 08, 2013 6:33 am 
Offline
User avatar

Joined: Sat May 11, 2013 9:45 am
Posts: 729
Location: PA, USA
It hnk the git for windows instructions apply equally well to windows 8.....you just need the 64 bit versions but I've never tried it.

https://code.google.com/p/open5xxxecu/w ... or_Windows


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sat Jun 08, 2013 8:39 pm 
Offline
User avatar

Joined: Sat May 11, 2013 9:52 am
Posts: 304
Location: Over here, doing 'over here' things.
I think I'm figuring it out.

_________________
/me goes off to the corner feeling like Jerry Springer with a mullet.

My O5E candidate: 1982 Honda CX500TC motorcycle.


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sun Jun 09, 2013 2:09 am 
Offline
User avatar

Joined: Sat May 11, 2013 9:52 am
Posts: 304
Location: Over here, doing 'over here' things.
Having trouble figuring out which "branch" of the code I've downloaded.

No one puts comments about that anywhere in the source?

_________________
/me goes off to the corner feeling like Jerry Springer with a mullet.

My O5E candidate: 1982 Honda CX500TC motorcycle.


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sun Jun 09, 2013 7:16 am 
Offline
User avatar

Joined: Sun May 19, 2013 8:32 pm
Posts: 12
Branch is a concept that is independant of source files.

I know al sorts of command line calls to get you branch information, even in windows, but not the UI stuff :/

http://git-scm.com/book/en/Getting-Started-Git-Basics


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sun Jun 09, 2013 7:54 am 
Offline
User avatar

Joined: Sat May 11, 2013 9:45 am
Posts: 729
Location: PA, USA
When you clone you get the whole repo and all the branches.....which all sit in the 1 folded so it looks like 1 brnach......really confusing and a big part of my hate of GIT

To figure out which branch you are looking at just right click the folder and in the list of stuff will be :

Git commit ->"branch name"

to switch branches select:
TortoiseGit, then switch/checkout

To create your own branch
TortoiseGit, then Create Branch


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sun Jun 09, 2013 8:17 am 
Offline
User avatar

Joined: Sun May 26, 2013 6:39 pm
Posts: 14
Git is awesome.

I highly recommend learning on the command line rather than in a user interface. A tool like qgit is invaluable for visualizing what's going on.


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sun Jun 09, 2013 9:20 am 
Offline
User avatar

Joined: Sat May 11, 2013 9:45 am
Posts: 729
Location: PA, USA
patrick wrote:
Git is awesome..


Git seems to be a love/Hate thing.

To date Git has mostly just f****d up stuff for us and accounts for probably 90% of the user support type questions that come in, so from my point of view as the one tasked with answering the questions adopting Git is without question the biggest mistake we've made to date. I'm sure it's a good tool in the hands of someone who actually understands it but it's nothign like intuative, particularly to peoiple use to the window world and that causes a lot of problems.

Once the code gets a bit more stable we can just put an s19 file up on the download page so most people don't need to deal with Git and things should get a lot better....plus now you'r here and you seem to actually know how to use Git properly so that will certainly help :)


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sun Jun 09, 2013 12:12 pm 
Offline
User avatar

Joined: Thu May 30, 2013 1:11 am
Posts: 54
So it looks like I am trying to break things here as well. From the GIT history:

Author: Clint Corbin <clcorbin@comcast.net> 2013-06-07 16:57:08
Committer: Clint Corbin <clcorbin@comcast.net> 2013-06-07 16:57:08
Parent: 802fb2fbee31c7fab4f2733aadb267d66d0adbf4 (merge fixes)
Parent: 6c807b57a64a08841b00e1d1b0d257becacd938b (fix merge)
Branch: master
Follows: Beta-.90
Precedes:

Merge branch 'development_5634' of https://code.google.com/p/open5xxxecu.firmware

The "what the hell????" part of this is I THOUGHT I was SWITCHING from Master to Development_5634. But this clearly says it MERGED them! :oops: So can this be unrolled???

So the reason I was even looking at this stuff this morning is that after reading more of this thread, I decided I wanted to create my own branch. So I couldn't screw up Master with what I am working on... Apparently, I am too late for that. Sigh. Can I go ahead and create a branch from master, or should I wait for this to cleaned up (if it can be!) before I do?


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sun Jun 09, 2013 12:13 pm 
Offline
User avatar

Joined: Thu May 30, 2013 1:11 am
Posts: 54
mk e wrote:
Git seems to be a love/Hate thing.


I'm kind of working on the "hate" side of GIT right now...


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sun Jun 09, 2013 12:42 pm 
Offline
User avatar

Joined: Sat May 11, 2013 9:52 am
Posts: 304
Location: Over here, doing 'over here' things.
clcorbin wrote:
mk e wrote:
Git seems to be a love/Hate thing.


I'm kind of working on the "hate" side of GIT right now...

Git outta my head wicked monkey!
:lol:

I was doing like what you said above and when I saw "Master" I was like "no friggin' way".

That's why I made the comment above about no one commenting the code.

_________________
/me goes off to the corner feeling like Jerry Springer with a mullet.

My O5E candidate: 1982 Honda CX500TC motorcycle.


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Sun Jun 09, 2013 4:55 pm 
Offline
User avatar

Joined: Sat May 11, 2013 9:45 am
Posts: 729
Location: PA, USA
clcorbin wrote:
So it looks like I am trying to break things here as well. From the GIT history:

Author: Clint Corbin <clcorbin@comcast.net> 2013-06-07 16:57:08
Committer: Clint Corbin <clcorbin@comcast.net> 2013-06-07 16:57:08
Parent: 802fb2fbee31c7fab4f2733aadb267d66d0adbf4 (merge fixes)
Parent: 6c807b57a64a08841b00e1d1b0d257becacd938b (fix merge)
Branch: master
Follows: Beta-.90
Precedes:

Merge branch 'development_5634' of https://code.google.com/p/open5xxxecu.firmware

The "what the hell????" part of this is I THOUGHT I was SWITCHING from Master to Development_5634. But this clearly says it MERGED them! :oops: So can this be unrolled???

So the reason I was even looking at this stuff this morning is that after reading more of this thread, I decided I wanted to create my own branch. So I couldn't screw up Master with what I am working on... Apparently, I am too late for that. Sigh. Can I go ahead and create a branch from master, or should I wait for this to cleaned up (if it can be!) before I do?


As long as you don't do a "push" the changes are only on your machine so nothing important is broken.

It's REALLY easy to start working on the wrong branch because you have to go look where you are, Git doesn't make it obvious.

Since I suck at Git what I would do is make a fresh clone. Switch to Development_5634, create a new personal branch, then copy the files you were working on in the old repo to the new branch...delete the old repo. Fixed.

as I said about 90% of the support questions that come up are Git related to Git not o5e :o


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Fri Jun 14, 2013 1:52 am 
Offline
User avatar

Joined: Sat May 11, 2013 9:52 am
Posts: 304
Location: Over here, doing 'over here' things.
Thought I was getting it but am still lost.
Uninstalling GIT and stuff and starting over.

mk e wrote:
...
as I said about 90% of the support questions that come up are Git related to Git not o5e :o

I can understand that now.

It would be nice if there were something posted here for the dozens of us not getting it.
(okay, just me :oops:)
I know you're busy with your things so I'm trying not to pester much and when I figure it out, I'll post it.

_________________
/me goes off to the corner feeling like Jerry Springer with a mullet.

My O5E candidate: 1982 Honda CX500TC motorcycle.


Top
 Profile  
 
 Post subject: Re: I've never done any versioning.
PostPosted: Fri Jun 14, 2013 8:12 am 
Offline
User avatar

Joined: Sat May 11, 2013 9:45 am
Posts: 729
Location: PA, USA
There is NOTHING intuitive about Git to most people who live in the windows world so I'm not surprised.

Tell me where exactly are you getting stuck on the instruction sheet:

https://code.google.com/p/open5xxxecu/w ... or_Windows

and we'll go from there. I'ts actually not hard, it just doesn't work the way most people's brains expect it to and that causes a LOT of problems.


Top
 Profile  
 
Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 14 posts ] 

Who is online

Users browsing this forum: No registered users and 1 guest


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot post attachments in this forum

Search for:
Jump to:  
cron
Theme designed by stylerbb.net © 2008
Powered by phpBB © 2000, 2002, 2005, 2007 phpBB Group
All times are UTC - 5 hours [ DST ]