Root Git & Github questions

[g60madman]

I've set up a test account on github. I hope the new forks helps me to trace this down.

Did python get updated on your local system?

File "/usr/lib/python2.6/urllib2.py", line 126, in urlopen
return _opener.open(url, data, timeout)
File "/usr/lib/python2.6/urllib2.py", line 397, in open
response = meth(req, response)
File "/usr/lib/python2.6/urllib2.py", line 510, in http_response
'http', request, response, code, msg, hdrs)
File "/usr/lib/python2.6/urllib2.py", line 435, in error
return self._call_chain(*args)
File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain
result = func(*args)

 

[dsmryder]

Did python get updated on your local system?

File "/usr/lib/python2.6/urllib2.py", line 126, in urlopen
return _opener.open(url, data, timeout)
File "/usr/lib/python2.6/urllib2.py", line 397, in open
response = meth(req, response)
File "/usr/lib/python2.6/urllib2.py", line 510, in http_response
'http', request, response, code, msg, hdrs)
File "/usr/lib/python2.6/urllib2.py", line 435, in error
return self._call_chain(*args)
File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain
result = func(*args)

Maaaaaby? If i can get my daughter to kick on my build rig, I'll remote in to it and see if I chan check the version number. And see what it should be.
I was thinking that it may of had something to do with an Ubuntu update.

 

[dsmryder]

Python version number 2.6.5
I'm looking into what version I should have

 

[dsmryder]

I have done a dsmrydertest github to test out some ideas I had, and I seem to be right. I forked some of the projects from g60 and updated the default.xml to reflect it and I have built two ROMs so far. I am still tracking which project it is that's causing my issue, but I'm figuring it out.

 

[dsmryder]

It was something in the frameworks_base project. I'm not sure what got corrupt, I just know I can get back to work.

 

[dsmryder]

holey crap! It was my dsmryderaudio.mk file. I don't know why, but I'm hyjacking on of the other packs and making it my own.

 

[dsmryder]

When I repo sync, git (I guess) will change me back to "no branch" so I would need to checkout "gingerbread" before I build every time.
It says that the project doesn't track upstream.

 

[g60madman]

Is this for git push -u origin branch? If you repo sync you can not push from there you need to git clone with ssh the repo and then make changes and push back. Then repo sync to pull back in the changes.

I have the repo sync folder where i make changes and test. Then I have a second folder where I copy changes and then git push them back up to git. I then delete all folders in the repo sync folder just not the .repo folder. Then I repo sync to pull in the changes. This may not be best practice but seems to work for me

 

[dsmryder]

Is this for git push -u origin branch? If you repo sync you can not push from there you need to git clone with ssh the repo and then make changes and push back. Then repo sync to pull back in the changes.

I have the repo sync folder where i make changes and test. Then I have a second folder where I copy changes and then git push them back up to git. I then delete all folders in the repo sync folder just not the .repo folder. Then I repo sync to pull in the changes. This may not be best practice but seems to work for me

Most of my projects don't have a branch. I guess it's because the default.xml is set to use gingerbread as the default branch. I had a point where I had to push up to github and I think I had to force it (git push -f github gingerbread). I don't do most of my commits from my local repo, I usually do them from the website.

 

[dsmryder]

I may have stumbled on to my answer
A Rebase Workflow for Git | RandyFay.com

 

[dsmryder]

[Guide] How to use Github - xda-developers, Be sure to hit the thanks button on his account.

 

[dsmryder]

When we run a

$ repo sync

the branch that is in the manifest.xml is pulled, but the branch isn't created on the local machine. What I have found is if you checkout that branch while on the "no branch" you will have the link and you could push up the changes to your remote repo.

git checkout -t github/cm7

This will link the remote "github/cm7" to cm7 on the local with the "-t" argument and if you do

git branch -a

you will see

As you can see, I have two local branches and four remote branches with one included in the manifest I guess (remotes/m/cm7)

 

[dsmryder]

When we pull a project down via a repo sync we don't checkout any branches.

I like to track the branch that's associated with project section

git checkout -t github/ics

Obviously we would use the branch that we see when looking at all of the branches. It does have to have the upstream(github or origin or whatever) and the branch(ics, dsmryder, master)
Then I will make a new branch and check it out (at the same time)

git checkout -b (new branch name)

When that's all done your polling of branch -a looks like this

You can make what ever changes you want, preferably to the branch that was created. When you have your changes commited (many ways to do it) push the changes up

 

[dsmryder]

Git - Stashing
Major improvement to work flow.

Imagine you just made a ton of changes (like I just did (and I didn't "listen" to adamto)) and something you just changed may have hosed your project.
If you didn't commit the work, stash it away! That way you could just test the project the way it was.

And maybe make smaller changes.

 

[dsmryder]

Bump bump!