• 1
  • 2(current)
  • 3
  • 4
  • 5
  • 9
[AEON] HOW-TO download/install/update/test Aeon from its Git repository
#16
Great job with the guide!! You know you've done good when you get a nod from,.....well,..you know who Wink

Quote:Kudos for this. Cool

lol..seriously, it would be good if the guide was made sticky or put somewhere else, just so all the hard work doesn't get lost 20 pages deeps by next week. Aeons threads move pretty fast!
Reply
#17
kulprit Wrote:Ok, so got this all working, but I edit my own files, to say includes the international ratings mod. When i go to pull for an update i get

error: Entry '720p/DialogVideoInfo.xml' not uptodate. Cannot Merge.

Which setting do I have to change to allow it to merge. Or even so it will overwrite it if there has been a change and I can modify the file again?

This would be a "manual merge" situation, and I don't have enough experience with git to know the best procedure. (Sorry, I come from the land of Rational ClearCase.) The only thing I can think of would be to add that file to the .gitignore file so that git won't try to update it. Of course, you won't get further updates after that.

The problem is that git is trying to merge in the changes that djh has made, but it is trying to apply the delta (change) to a particular state of the file. If that state has changed, then git isn't smart enough to know if the delta will conflict with your change or not.
[04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
Reply
#18
Have an idea for a work around for people who edit stuff.

If you do a git stash save, this will reload the last download you did, then update with a pull.
Finally do a git stash apply, and your changes should come back, going to try it now.

All worked great on the xml files i had changed, although it didn't like the change on one of the movielines.png. So resolved this and tried again, all worked great.
I have also started using tortoise git, along with git bash, so i can see in my file system how things are going.
Reply
#19
I have everything setup. Followed the directions to the tee but once I do git checkout -b auriga origin/auriga the following comes up:

[email]xbmc@xbmc:~/.xbmc[/email]/skin/Aeon Auriga$ git checkout -b auriga origin/auriga
warning: refname 'origin/auriga' is ambiguous.
warning: refname 'origin/auriga' is ambiguous.
fatal: Ambiguous object name: 'origin/auriga'.
Reply
#20
Have been getting a corrupted error for days now, any ideas?

Just running standard
Code:
git clone git://github.com/djh/aeon.git

Code:
git clone git://github.com/djh/aeon.git
Initialized empty Git repository in /home/blake/sr/aeon/.git/
remote: Counting objects: 1890, done.
remote: Compressing objects: 100% (1421/1421), done.
remote: Total 1890 (delta 569), reused 1660 (delta 395)
Receiving objects: 100% (1890/1890), 209.98 MiB | 56 KiB/s, done.
Resolving deltas: 100% (569/569), done.
error: failed to read object 3ee858232279a6288ef89d87ef80b7a26f864a4e at offset 24926796 from /home/blake/sr/aeon/.git/objects/pack/pack-dfa9f71838bf538d4e72dbdd4b4b78c0f6dd8447.pack
error: failed to read object 3ee858232279a6288ef89d87ef80b7a26f864a4e at offset 24926796 from .git/objects/pack/pack-dfa9f71838bf538d4e72dbdd4b4b78c0f6dd8447.pack
fatal: object 3ee858232279a6288ef89d87ef80b7a26f864a4e is corrupted
Reply
#21
Ritzie Wrote:I have everything setup. Followed the directions to the tee but once I do git checkout -b auriga origin/auriga the following comes up:

[email]xbmc@xbmc:~/.xbmc[/email]/skin/Aeon Auriga$ git checkout -b auriga origin/auriga
warning: refname 'origin/auriga' is ambiguous.
warning: refname 'origin/auriga' is ambiguous.
fatal: Ambiguous object name: 'origin/auriga'.

Did you receive any errors from any of the previous commands? It's difficult to diagnose, since I'm not a git specialist. If not please delete the "Aeon Auriga" directory and start over, performing all of the steps in one terminal window. Then post the entire session here as a text file attachment or encapsulated in CODE tags.

GhostSeven Wrote:Have been getting a corrupted error for days now, any ideas?

Just running standard
Code:
git clone git://github.com/djh/aeon.git

Code:
git clone git://github.com/djh/aeon.git
Initialized empty Git repository in /home/blake/sr/aeon/.git/
remote: Counting objects: 1890, done.
remote: Compressing objects: 100% (1421/1421), done.
remote: Total 1890 (delta 569), reused 1660 (delta 395)
Receiving objects: 100% (1890/1890), 209.98 MiB | 56 KiB/s, done.
Resolving deltas: 100% (569/569), done.
error: failed to read object 3ee858232279a6288ef89d87ef80b7a26f864a4e at offset 24926796 from /home/blake/sr/aeon/.git/objects/pack/pack-dfa9f71838bf538d4e72dbdd4b4b78c0f6dd8447.pack
error: failed to read object 3ee858232279a6288ef89d87ef80b7a26f864a4e at offset 24926796 from .git/objects/pack/pack-dfa9f71838bf538d4e72dbdd4b4b78c0f6dd8447.pack
fatal: object 3ee858232279a6288ef89d87ef80b7a26f864a4e is corrupted
I was going to ask if you edited any of the files, but since you are running the clone command you shouldn't have had any files to edit yet. It seems like something is interfering with your access to that directory. Any reason why you are cloning it into a directory outside of .xbmc?
[04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
Reply
#22
Cleared everything back down, removed the directories, check my hdd for errors and re-ran the process, all working fine now, odd, but glad its working thanks for the advice
Reply
#23
I followed what was in the terminal like you said and it worked perfectly. Thanks!!! The first time I followed the written part.
Reply
#24
Is it just me or is the GIT thing working very very badly, I get to the following point:

Code:
Welcome to Git (version 1.6.2.2-preview20090408)


Run 'git help git' to display the help index.
Run 'git help <command>' to display help for specific commands.

$ git clone git://github.com/djh/aeon.git
Initialized empty Git repository in c:/Documents and
remote: Counting objects: 1890, done.
remote: Compressing objects: 100% (1421/1421), done.
Receiving objects:  15% (291/1890), 8.94 MiB | 233 KiB/s

And then it stops... just sits there and looks stupid for hours on end Sad am I doing something wrong or is GIT just not a very reliable service...

EDIT
Never mind restarting it over and over and over again gets you there in the end... still think something is not completely right with having to do that and all but hey, as long as it gets there in the end.
Reply
#25
Most likely it's an issue with your internet connection, but perhaps github (where aeon's repository is stored) is having some connection issues. I'd try again later.
[04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
Reply
#26
Odd.. I can't see the two folders that git created in win explorer - "Aeon Stark" and "Aeon Aruiga" - but can see them fine in git bash... ?

Also, when doing the checkout on the "Aeon Aruiga" folder to make it pull from the Aruiga branch, when you do the git pull after that, should it not grab all the updates/changes that go along with Aruiga?

I was assuming after doing the initial command that creates the folder, it was grabbing all the files from "master" which would be Stark.. but then when you do the "git checkout" command to repoint to Aruiga, would it not then need to grab everything that's different in that branch?
Reply
#27
I'm not sure why you can't see the "Auriga Stark" and "Aeon Auriga" folders in Windows Explorer, but when you do git clone I believe it downloads everything, including changes on other branches. In this case it wouldn't be detrimental since Aeon only has two branches, but on a much larger project you certainly wouldn't want to use git clone unless you were setting up another group repository. At least, that's my understanding.
[04/03/2009 04:42:13PM Agent (Prashant_190023): "You are most welcome to the best democratic countries of the world -- India"] --Dell Chat
Reply
#28
Ok, well it appears it's a Vista thing

Redid the process under XP and folder showing up no problems

Anyone know if there's some stupid security issue setting in Vista that is causing the skin folders from not being visible that I could be missing?

Yes, I did check for showing hidden files/folders
Reply
#29
Eldorado Wrote:Ok, well it appears it's a Vista thing

Redid the process under XP and folder showing up no problems

Anyone know if there's some stupid security issue setting in Vista that is causing the skin folders from not being visible that I could be missing?

Yes, I did check for showing hidden files/folders

Ok, nevermind... stupid me, the ol Vista "run as administrator" got me... ugh I hate that thing!
Reply
#30
When I'm trying to get the auriga branch in git i get a
Code:
cissou@monkey-d-luffy:~/skins$ git checkout -b auriga origin/auriga
fatal: Not a git repository
Reply
  • 1
  • 2(current)
  • 3
  • 4
  • 5
  • 9

Logout Mark Read Team Forum Stats Members Help
[AEON] HOW-TO download/install/update/test Aeon from its Git repository2