Re: Not able ti push/pull



Simos Xenitellis skreiv:
2010/3/22 Kolbjørn Stuestøl <kolbjoern stuestoel no>:
I just downloaded my n^_th_ clone to a new folder using

$ git clone ssh://USERNAME git gnome org/git/gimp-help-2

And mysteriously wonder, I got "Already up-to-date." when running "git
pull".
No I am going to change some of my po files, running some git commands on
them and try "git pull". Hoping it works :-)

'git pull --rebase' is used to retrieve any updates that have been
added to git.gnome.org,
since you last cloned/pulled.
It is recommended to use the 'git up' alias instead of 'git pull --rebase'.
There is an issue when you just use 'git pull' instead of 'git pull
--rebase', so
we advise against using the plain 'git pull'.

With 'git commit ...' you add your changes to your local clone.
One you run 'git push', all your additional commits in your local
clone will be sent to git.gnome.org.
Until you do 'git push', you do not affect in any way git.gnome.org.

Once you 'git push', have a look at your addition at
http://git.gnome.org/browse/gimp-help-2/

A common issue when you 'git push' is that the repository at
'git.gnome.org' may have changed;
for example, another translator may have just added their translation.
You can verify at
http://git.gnome.org/  In this case, what you do is 'git up' to update
your local clone and then 'git push'.

I'll be back if the git push do not works. I have a slow internet connection
(via satellite), so it will take some time.

The workflow with git is that you establish your local clones of the
repositories
you are interested in, and then you 'git up' to update those you need in order
to submit translations. All of GNOME 2.30 is about 3GB, while GIMP is
about 300MB.

I am not sure what speeds you get when you 'git clone'. If you get
slow-ish speeds
compared to what you get when you download files with Firefox (HTTP protocol),
it might be easier to have the 'git clone' performed on some Internet
server and
then compress it to a ZIP file. Then, you use a download manager (or Firefox)
to download this single ZIP file and finally extract the repositories.

If cloning speed is an issue to you, ask me for more details on this.

Simos
Thank you a lot for your tips. I have met the right person :-)
I have followed the "http://live.gnome.org/TranslationProject/GitHowTo"; among others. In addition I have got lots of help from the good and clever peoples at the GIMP mailing list (gimp-docs Berkeley <gimp-docs lists XCF berkeley EDU>). I am not a programmer, just a translator having fun with solving problems.

No, my internet connection is always slow, about 100kb/s on good days. (The theoretical download speed 1Mb/s never reached). This has nothing to do with GNOME or git. I just starts downloading and then doing other things in the meantime. But perhaps I'll give your tip a try some day?

I had to update (against the pot files) and rewrite my po files. At the moment I am validating them --- and alas some errors showed up. I therefore have to correct these errors and thereaafter make html files to have a look at my work before I run
git add .
git commit -m "[some text]"
and then hopefully git push will work.

With thanks from
Kolbjoern



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]