Re: problem with git
El sáb, 02-05-2009 a las 15:57 +0530, Tirumurti Vasudevan escribió: > well my translation team lead delivered a girl baby and so i decided > to take up the commits of translated po files on my own > i need someone to hold my hand till i get the hang of this. > i have an account alright. > > this morning i tried to work with git. > went through the How to use Git for GNOME translators page > i browsed through the http://git.gnome.org/ repositories and decided on totum. > > i verified my account exists configured git and cloned totum (oh boy 13.8 Mb!) > > here i have a problem. > i saw the damned lies page that GNOME 2.28 (development) is the one > to work with. > actually i have downloaded all the po files as of now. > i have updated the totum file. > > i see no branch GNOME 2.28 in the git repos. > i have opened the totum folder and found the ta.po is upto date and > that belongs to 2.26 GNOME 2.26 means the stable branch, however not all the modules have been branched for GNOME 2.26. Right now there is no GNOME 2.28 branch for modules, this means GNOME 2.28 is the development branch and is called master at GNOME's GIT. There is where you have to commit your changes. > what to do now? > > thanks in advance > > dr.tv > > -- Jorge González González Weblog: http://aloriel.no-ip.org Fotolog: http://www.flickr.com/photos/aloriel ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
Le mercredi 06 mai 2009 à 08:41 +0530, Tirumurti Vasudevan a écrit : > i have a problem. > i saw the damned lies page that GNOME 2.28 (development) is the one > to work with. > when i clone a repo there is no 2.28 folder there. Hi Tirumurti, GNOME 2.28 is currently using the 'master' branch of modules. > nor a folder called master When you clone, git automatically set your working directory to master. You can do a "git branch" to show the current branch. Unlike SVN, there is no directory-per-branch structure. > where can i put the newly updated file? > thanks in advance Just put it in your checkout tree. And please, carefully read http://live.gnome.org/TranslationProject/GitHowTo Cheers, Claude ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Wed, May 6, 2009 at 12:19 PM, Claude Paroz wrote: > > Just put it in your checkout tree. And please, carefully read > http://live.gnome.org/TranslationProject/GitHowTo > > thanks for the reply. i will put it in the po folder and see what happens regards tv ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Wed, May 6, 2009 at 11:03 AM, Tirumurti Vasudevan wrote: > > > -- Forwarded message -- > From: Tirumurti Vasudevan > Date: Wed, May 6, 2009 at 3:31 PM > Subject: Re: problem with git > To: Runa Bhattacharjee > > > > > On Wed, May 6, 2009 at 12:00 PM, Runa Bhattacharjee > wrote: >> >> The files would be inside the po directory. Since Gnome repository has now >> moved to git, 'master' on the l10n.gnome.org page indicates that the 'po' >> directory of the 'master' branch is the one that would accept the >> translations. > > ok. > so i cloned vinagre this morning. > yes, there is a po folder. > the ta.po that i am interested in belongs to gnome 2.26 > damned lies says there is a fuzzy string and one untranslated entry. > i examine the file and there are none untranslated nor a fuzzy one. > > i download the file from damed lies and sure, there are two strings that > need correction. > so what do i do? The .po files in the po/ subdirectory from the repository are not updated automatically and do not reflect the latest version of PO files. You can get the most fresh .po file directly from l10n.gnome.org, or you can simply run cd po/ intltool-update ta which will update ta.po to reflect the current status of the source code. This is what l10n.gnome.org/damnedlies does for you. Simos ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
aha! that is it! thanks! tv On Wed, May 6, 2009 at 4:09 PM, Simos Xenitellis wrote: > you can simply run > > cd po/ > intltool-update ta > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
thanks a ton! did as you said and commited the files successfully. now to experiment with a shallow clone. suggestions? tia drtv On Wed, May 6, 2009 at 4:09 PM, Simos Xenitellis wrote: > you can simply run > > cd po/ > intltool-update ta > > which will update ta.po to reflect the current status of the source > code. This is what l10n.gnome.org/damnedlies does for you. > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Wed, May 6, 2009 at 5:39 PM, Tirumurti Vasudevan wrote: > thanks a ton! > did as you said and commited the files successfully. > > now to experiment with a shallow clone. > suggestions? I did some experiments with shallow clones, http://blogs.gnome.org/simos/2009/04/18/git-clones-vs-shallow-git-clones/ I noticed that there is no significant benefit. In fact, it is possible to mess up the repository in a weird way. There are unknown issues when you try to push your changes from your shallow clone. Hope this helps, Simos > > tia > drtv > > On Wed, May 6, 2009 at 4:09 PM, Simos Xenitellis > wrote: >> >> you can simply run >> >> cd po/ >> intltool-update ta >> >> which will update ta.po to reflect the current status of the source >> code. This is what l10n.gnome.org/damnedlies does for you. > > > > -- > My blogs: [all in Tamil] > http://anmikam4dumbme.blogspot.com/ > http://chitirampesuthati.blogspot.com/ photo blog now with english text too! > http://kathaikathaiyaam.blogspot.com/ > > BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! > ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
> > I did some experiments with shallow clones, > http://blogs.gnome.org/simos/2009/04/18/git-clones-vs-shallow-git-clones/ > > I noticed that there is no significant benefit. In fact, it is > possible to mess up the repository > in a weird way. There are unknown issues when you try to push your > changes from your shallow clone. > > Hope this helps, > i will have to use a download manager and download the repo in the free net time. possible? url? regards tv ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Wed, May 6, 2009 at 5:56 PM, Tirumurti Vasudevan wrote:
>> I did some experiments with shallow clones,
>> http://blogs.gnome.org/simos/2009/04/18/git-clones-vs-shallow-git-clones/
>>
>> I noticed that there is no significant benefit. In fact, it is
>> possible to mess up the repository
>> in a weird way. There are unknown issues when you try to push your
>> changes from your shallow clone.
>>
>> Hope this helps,
>
> i will have to use a download manager and download the repo in the free net
> time.
> possible?
> url?
I have put the GNOME release repositories (94 modules) available as a
.tar.gz archive at
http://simos.info/pub/GNOME-REPOS.07May09.tar.gz (1.5GB)
Feel free to download.
To save space, I removed the working copy, so for module 'eog', you will notice
that there is eog/.git/* only. This is good, because all the
information necessary for a repository
are found in .git/. Below I show how to checkout the working copy.
In addition, these are anonymous clones, which means that you also
need to convert to non-anonymous ('eponymous'?).
Here are the commands:
$ cd MODULENAME
$ git remote rm origin
$ git remote add origin -m master -f ssh://myusern...@git.gnome.org
$ git config branch.master.remote origin
$ git config branch.master.merge refs/heads/master
(Source:
http://live.gnome.org/TranslationProject/GitHowTo#head-f7ae4c567cd3e4aa8a76bdcab8264068de68cf23)
Finally, to checkout the working copy (checkout 'master'), do
$ git reset --hard
I'ld be interested in any feedback from the above.
The above commands can be automated with
http://github.com/simos/gnome-i18n-manage-vcs/tree/master
though at this stage would require some reading in the source code.
Simos
___
gnome-i18n mailing list
gnome-i18n@gnome.org
http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
aw! i just spent hours downloading most of the repo. wish it had come couple ogf days ahead. :-( tv On Fri, May 8, 2009 at 3:40 AM, Simos Xenitellis wrote: > I'ld be interested in any feedback from the above. > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
more problems i am doing something wrong. what is it? tia tv --- d...@narayana:~/git$ cd brasero/ d...@narayana:~/git/brasero$ git status # On branch master # Untracked files: # (use "git add ..." to include in what will be committed) # # po/brasero.pot nothing added to commit but untracked files present (use "git add" to track) d...@narayana:~/git/brasero$ git push To ssh://vasude...@git.gnome.org/git/brasero ! [rejected]master -> master (non-fast forward) error: failed to push some refs to 'ssh:// vasude...@git.gnome.org/git/brasero' d...@narayana:~/git/brasero$ git pull --rebase remote: Counting objects: 31, done. remote: Compressing objects: 100% (23/23), done. remote: Total 23 (delta 21), reused 0 (delta 0) Unpacking objects: 100% (23/23), done. >From ssh://vasude...@git.gnome.org/git/brasero 17fe531..54f7ba8 master -> origin/master First, rewinding head to replay your work on top of it... Applying Updated Tamil translation Applying Updated Tamil translation d...@narayana:~/git/brasero$ git status # On branch master # Untracked files: # (use "git add ..." to include in what will be committed) # # po/brasero.pot nothing added to commit but untracked files present (use "git add" to track) d...@narayana:~/git/brasero$ git add ta.po fatal: pathspec 'ta.po' did not match any files ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
Did you create the clones using the anonymous clones from my website? Can you verify? To check that your clone has been properly converted, try git pull --rebase If the command works, then the clone is good. On Fri, May 8, 2009 at 2:53 AM, Tirumurti Vasudevan wrote: > more problems > i am doing something wrong. what is it? > tia > tv > --- > d...@narayana:~/git$ cd brasero/ > d...@narayana:~/git/brasero$ git status > # On branch master > # Untracked files: > # (use "git add ..." to include in what will be committed) > # > # po/brasero.pot > nothing added to commit but untracked files present (use "git add" to track) You ran 'intltool-update -P' which created po/brasero.pot. This file does not get committed, so the above command shows there is nothing to commit. If you did not commit something earlier, then there is nothing that can be pushed. > d...@narayana:~/git/brasero$ git push > To ssh://vasude...@git.gnome.org/git/brasero > ! [rejected] master -> master (non-fast forward) > error: failed to push some refs to > 'ssh://vasude...@git.gnome.org/git/brasero' It is strange that you get an error, since there is probably nothing to push. > d...@narayana:~/git/brasero$ git pull --rebase > remote: Counting objects: 31, done. > remote: Compressing objects: 100% (23/23), done. > remote: Total 23 (delta 21), reused 0 (delta 0) > Unpacking objects: 100% (23/23), done. > From ssh://vasude...@git.gnome.org/git/brasero > 17fe531..54f7ba8 master -> origin/master > First, rewinding head to replay your work on top of it... > Applying Updated Tamil translation > Applying Updated Tamil translation This shows that there are two commits that were pushed earlier and are not downloaded. It appears you committed those changes at some point earlier. > d...@narayana:~/git/brasero$ git status > # On branch master > # Untracked files: > # (use "git add ..." to include in what will be committed) > # > # po/brasero.pot > nothing added to commit but untracked files present (use "git add" to track) > d...@narayana:~/git/brasero$ git add ta.po > fatal: pathspec 'ta.po' did not match any files The ta.po should be in po/, so git add po/ta.po 'git status' however does not show that po/ta.po is a new untracked file. Simos ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Fri, May 8, 2009 at 8:40 AM, Simos Xenitellis wrote: > Did you create the clones using the anonymous clones from my website? > Can you verify? sir, it was downloaded from http://git.gnome.org/cgit/ through terminal commands. > > To check that your clone has been properly converted, try > > git pull --rebase > i have done that as you can see from the output in terminal. > > > You ran 'intltool-update -P' which created po/brasero.pot. > This file does not get committed, so the above command shows there is > nothing to commit. > If you did not commit something earlier, then there is nothing that > can be pushed. yes, i had run it to get the latest and updated the translation > > > d...@narayana:~/git/brasero$ git push > > To ssh://vasude...@git.gnome.org/git/brasero > > ! [rejected]master -> master (non-fast forward) > > error: failed to push some refs to > > 'ssh://vasude...@git.gnome.org/git/brasero' > > It is strange that you get an error, since there is probably nothing to > push. > > > d...@narayana:~/git/brasero$ git pull --rebase > > remote: Counting objects: 31, done. > > remote: Compressing objects: 100% (23/23), done. > > remote: Total 23 (delta 21), reused 0 (delta 0) > > Unpacking objects: 100% (23/23), done. > > From ssh://vasude...@git.gnome.org/git/brasero > >17fe531..54f7ba8 master -> origin/master > > First, rewinding head to replay your work on top of it... > > Applying Updated Tamil translation > > Applying Updated Tamil translation > > This shows that there are two commits that were pushed earlier and are > not downloaded. > It appears you committed those changes at some point earlier. > the mistake i did was first to commit with out replacing the ta.po file. second to commit and not push. i did not realise that was also needed. when the changes did not appear in the web i went back to the howto page and found the mistake. so i tried to push with the results you see. > > > d...@narayana:~/git/brasero$ git status > > # On branch master > > # Untracked files: > > # (use "git add ..." to include in what will be committed) > > # > > # po/brasero.pot > > nothing added to commit but untracked files present (use "git add" to > track) > > d...@narayana:~/git/brasero$ git add ta.po > > fatal: pathspec 'ta.po' did not match any files > > The ta.po should be in po/, so > > git add po/ta.po > > 'git status' however does not show that po/ta.po is a new untracked file. > > Simos > i will check if it is the updated file later and let know. i got to run now thanks for holding my hand :-) regards tv -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
sir my problems persist. i tried with a new file. going by the book. well almost... fails to get pushed. - d...@narayana:~/git$ cd gnome-applets/ d...@narayana:~/git/gnome-applets$ git pull --rebase po/ta.po: needs update refusing to pull with rebase: your working tree is not up-to-date d...@narayana:~/git/gnome-applets$ intltool-update ta intltool-update: Unable to proceed. Make sure to run this script inside the po directory. d...@narayana:~/git/gnome-applets$ cd po d...@narayana:~/git/gnome-applets/po$ intltool-update ta . done. 792 translated messages, 1 fuzzy translation, 1 untranslated message. d...@narayana:~/git/gnome-applets/po$ git status # On branch master # Changed but not updated: # (use "git add ..." to update what will be committed) # # modified: ta.po # # Untracked files: # (use "git add ..." to include in what will be committed) # # gnome-applets-2.0.pot no changes added to commit (use "git add" and/or "git commit -a") d...@narayana:~/git/gnome-applets/po$ git commit ta.po -m "Updated Tamil translation" Created commit d7e86e4: Updated Tamil translation 1 files changed, 176 insertions(+), 222 deletions(-) d...@narayana:~/git/gnome-applets/po$ git push To ssh://vasude...@git.gnome.org/git/gnome-applets ! [rejected]master -> master (non-fast forward) error: failed to push some refs to 'ssh:// vasude...@git.gnome.org/git/gnome-applets' d...@narayana:~/git/gnome-applets/po$ On Fri, May 8, 2009 at 8:51 AM, Tirumurti Vasudevan wrote: > i will check if it is the updated file later and let know. > i got to run now > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Fri, May 8, 2009 at 12:43 PM, Tirumurti Vasudevan wrote: > sir my problems persist. > i tried with a new file. > going by the book. > well almost... > > fails to get pushed. > - > d...@narayana:~/git$ cd gnome-applets/ > d...@narayana:~/git/gnome-applets$ git pull --rebase > po/ta.po: needs update > refusing to pull with rebase: your working tree is not up-to-date You cannot 'pull' if you have any changes that have not been committed. You can either reset your tree (see Troubleshooting at http://live.gnome.org/TranslationProject/GitHowTo#head-90557442c0da836edad3a21a7ca4bce1aeaa68a1) or commit this change. > d...@narayana:~/git/gnome-applets$ intltool-update ta > intltool-update: Unable to proceed. > Make sure to run this script inside the po directory. > d...@narayana:~/git/gnome-applets$ cd po > d...@narayana:~/git/gnome-applets/po$ intltool-update ta > . > done. > 792 translated messages, 1 fuzzy translation, 1 untranslated message. > d...@narayana:~/git/gnome-applets/po$ git status > # On branch master > # Changed but not updated: > # (use "git add ..." to update what will be committed) > # > # modified: ta.po > # > # Untracked files: > # (use "git add ..." to include in what will be committed) > # > # gnome-applets-2.0.pot > no changes added to commit (use "git add" and/or "git commit -a") > d...@narayana:~/git/gnome-applets/po$ git commit ta.po -m "Updated Tamil > translation" > Created commit d7e86e4: Updated Tamil translation > 1 files changed, 176 insertions(+), 222 deletions(-) > d...@narayana:~/git/gnome-applets/po$ git push > To ssh://vasude...@git.gnome.org/git/gnome-applets > ! [rejected] master -> master (non-fast forward) > error: failed to push some refs to > 'ssh://vasude...@git.gnome.org/git/gnome-applets' > d...@narayana:~/git/gnome-applets/po$ It is not quite clear why the push failed. I think the easiest is to reset your local tree and simply apply the new translation again. When you reset you tree, make sure you have saved a copy of your translation, otherwise it gets overwritten. See http://live.gnome.org/TranslationProject/GitHowTo#head-1a5a7cbf51d18c276dcd7f6f453cf943f4a7992f Good luck, Simos > > On Fri, May 8, 2009 at 8:51 AM, Tirumurti Vasudevan > wrote: >> >> i will check if it is the updated file later and let know. >> i got to run now > > > -- > My blogs: [all in Tamil] > http://anmikam4dumbme.blogspot.com/ > http://chitirampesuthati.blogspot.com/ photo blog now with english text too! > http://kathaikathaiyaam.blogspot.com/ > > BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! > ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Fri, May 8, 2009 at 1:07 PM, Tirumurti Vasudevan wrote: > d...@narayana:~$ cd git/brasero/ > d...@narayana:~/git/brasero$ git reset --hard > HEAD is now at 632f269 Updated Tamil translation > d...@narayana:~/git/brasero$ git clean -n > Would remove po/brasero.pot > d...@narayana:~/git/brasero$ > > looks like a pot file also gets created and attached > > now? You can ignore the .pot file. Normally someone would add it to .gitignore, but it did not happen yet for this module. That file is expendable, so simply erase it per the instructions and you can then continue. Simos > tv > On Fri, May 8, 2009 at 5:24 PM, Simos Xenitellis > wrote: >> >> You can either reset your tree (see Troubleshooting at >> >> http://live.gnome.org/TranslationProject/GitHowTo#head-90557442c0da836edad3a21a7ca4bce1aeaa68a1) >> or commit this change. > > > -- > My blogs: [all in Tamil] > http://anmikam4dumbme.blogspot.com/ > http://chitirampesuthati.blogspot.com/ photo blog now with english text too! > http://kathaikathaiyaam.blogspot.com/ > > BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! > ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Fri, May 8, 2009 at 3:40 AM, Simos Xenitellis wrote: > cd MODULENAME > $ git remote rm origin > $ git remote add origin -m master -f ssh://myusern...@git.gnome.org > $ git config branch.master.remote origin > $ git config branch.master.merge refs/heads/master > ok, this morning i downloaded the file and extracted the entire bunch. this evening i ran the commands and submit the output d...@narayana:~/VCS$ cd brasero d...@narayana:~/VCS/brasero$ git remote rm origin d...@narayana:~/VCS/brasero$ git remote add origin -m master -f ssh:// vasude...@git.gnome.org Updating origin ssh: Could not resolve hostname : Name or service not known fatal: The remote end hung up unexpectedly error: Could not fetch origin d...@narayana:~/VCS/brasero$ -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Sat, May 9, 2009 at 1:03 PM, Tirumurti Vasudevan wrote: > > > On Fri, May 8, 2009 at 3:40 AM, Simos Xenitellis > wrote: >> >> cd MODULENAME >> $ git remote rm origin >> $ git remote add origin -m master -f ssh://myusern...@git.gnome.org >> $ git config branch.master.remote origin >> $ git config branch.master.merge refs/heads/master > > ok, this morning i downloaded the file and extracted the entire bunch. > this evening i ran the commands and submit the output > > d...@narayana:~/VCS$ cd brasero > d...@narayana:~/VCS/brasero$ git remote rm origin > d...@narayana:~/VCS/brasero$ git remote add origin -m master -f > ssh://vasude...@git.gnome.org > Updating origin > ssh: Could not resolve hostname : Name or service not known > fatal: The remote end hung up unexpectedly > error: Could not fetch origin > d...@narayana:~/VCS/brasero$ Thanks for trying out the archive at http://simos.info/pub/GNOME-REPOS.07May09.tar.gz There has been a discussion at gnome-infrastructure on this issue, and there are now easier instructions, http://live.gnome.org/TranslationProject/GitHowTo#head-f7ae4c567cd3e4aa8a76bdcab8264068de68cf23 What you need to do is simply run the command (assuming you are in brasero): git config remote.origin.url ssh://vasude...@git.gnome.org/git/brasero Then, with git reset --hard you will get the working copy for 'master', and you can start working. In order to update your local tree, you run git pull --rebase and you get your local brasero tree updated to what is available at git.gnome.org, in about a few seconds! The error message you get above means that the command tried to connect to git.gnome.org while you either did not have an internet connection, or momentarily the name resolution failed. Hope this helps, Simos ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Sat, May 9, 2009 at 7:16 PM, Simos Xenitellis wrote: > Thanks for trying out the archive at > http://simos.info/pub/GNOME-REPOS.07May09.tar.gz > There has been a discussion at gnome-infrastructure on this issue, and > there are now easier instructions, > > http://live.gnome.org/TranslationProject/GitHowTo#head-f7ae4c567cd3e4aa8a76bdcab8264068de68cf23 > > What you need to do is simply run the command (assuming you are in > brasero): > > git config remote.origin.url ssh://vasude...@git.gnome.org/git/brasero > > Then, with > > git reset --hard > > you will get the working copy for 'master', and you can start working. > thanks, i did so. the surprise is the ta.po i found is the updated version - the one i recently commited. seems the file was updated but some other errors arose. also i dont find the log entry in git. -http://git.gnome.org/cgit/brasero/ > > In order to update your local tree, you run > > git pull --rebase > i will try this after updating a newer file in some other modules and let know > > and you get your local brasero tree updated to what is available at > git.gnome.org, in about a few seconds! > > The error message you get above means that the command tried to > connect to git.gnome.org while you either did not have an internet > connection, or momentarily the name resolution failed. > oh the internet connection was alright. it did not even pause a few seconds to throw that msg at me! thanks tv -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
no end to my problems! --- d...@narayana:~$ cd git d...@narayana:~/git$ cd orca d...@narayana:~/git/orca$ git pull --rebase po/ta.po: needs update refusing to pull with rebase: your working tree is not up-to-date d...@narayana:~/git/orca$ cd po/ d...@narayana:~/git/orca/po$ intltool-update ta done. 1270 translated messages. d...@narayana:~/git/orca/po$ -- ta. po has been updated and commited but i am not able to push it. so i try pull --rebase and that does not work as you can see someone please help drtv ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
Le mercredi 20 mai 2009 à 11:45 +0530, Tirumurti Vasudevan a écrit : > no end to my problems! > --- > d...@narayana:~$ cd git > d...@narayana:~/git$ cd orca > d...@narayana:~/git/orca$ git pull --rebase > po/ta.po: needs update > refusing to pull with rebase: your working tree is not up-to-date That message tells you that you have non committed change in your working tree (po/ta.po in this case). You should either: - commit your file (git commit po/ta.po -m "") - reset the file to the version of the last commit (git checkout po/ta.po) Then the git pull -- rebase will work and you will be able to push your changes. Hope this helps Claude > d...@narayana:~/git/orca$ cd po/ > d...@narayana:~/git/orca/po$ intltool-update ta > > done. > 1270 translated messages. > d...@narayana:~/git/orca/po$ > -- > ta. po has been updated and commited but i am not able to push it. > so i try pull --rebase and that does not work as you can see > > someone please help > > drtv > > ___ > gnome-i18n mailing list > gnome-i18n@gnome.org > http://mail.gnome.org/mailman/listinfo/gnome-i18n ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
thanks. tried and perhaps the connection to git server was not good. it got timed out. i will try again later and get back thanks drtv On Wed, May 20, 2009 at 12:06 PM, Claude Paroz wrote: > Hope this helps > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
wow! worked. thanks a ton! drtv On Wed, May 20, 2009 at 12:06 PM, Claude Paroz wrote: > Hope this helps > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
i thank all those who helped me get the hang of git. i have been translating and pushing a few files in the last two days. thanks a million. btw an error msg should i be bothered about it? --- d...@narayana:~/git/gnome-applets/po$ git pull --rebase remote: Counting objects: 108, done. remote: Compressing objects: 100% (72/72), done. remote: Total 75 (delta 54), reused 0 (delta 0) Unpacking objects: 100% (75/75), done. >From ssh://vasude...@git.gnome.org/git/gnome-applets 3f745bd..052253d gnome-2-26 -> origin/gnome-2-26 7e80b03..b070247 master -> origin/master First, rewinding head to replay your work on top of it... Applying Updated Tamil translation Applying Updated Tamil translation d...@narayana:~/git/gnome-applets/po$ git push Counting objects: 11, done. Compressing objects: 100% (8/8), done. Writing objects: 100% (8/8), 2.23 KiB, done. Total 8 (delta 6), reused 0 (delta 0) error: refname 'GNOME_0_30_PATCHES' is ambiguous To ssh://vasude...@git.gnome.org/git/gnome-applets b070247..2e3a419 master -> master error: refname 'GNOME_0_30_PATCHES' is ambiguous d...@narayana:~/git/gnome-applets/po$ regards tv On Wed, May 20, 2009 at 12:21 PM, Tirumurti Vasudevan wrote: > wow! > worked. > thanks a ton! > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Thu, May 21, 2009 at 2:56 AM, Tirumurti Vasudevan wrote: > i thank all those who helped me get the hang of git. > i have been translating and pushing a few files in the last two days. > thanks a million. Thanks for your questions. They helped refine the page at http://live.gnome.org/TranslationProject/GitHowTo > > > btw > an error msg > should i be bothered about it? > --- > d...@narayana:~/git/gnome-applets/po$ git pull --rebase > remote: Counting objects: 108, done. > remote: Compressing objects: 100% (72/72), done. > remote: Total 75 (delta 54), reused 0 (delta 0) > Unpacking objects: 100% (75/75), done. > From ssh://vasude...@git.gnome.org/git/gnome-applets >3f745bd..052253d gnome-2-26 -> origin/gnome-2-26 >7e80b03..b070247 master -> origin/master > First, rewinding head to replay your work on top of it... > Applying Updated Tamil translation > Applying Updated Tamil translation This is good; all went fine. > d...@narayana:~/git/gnome-applets/po$ git push > Counting objects: 11, done. > Compressing objects: 100% (8/8), done. > Writing objects: 100% (8/8), 2.23 KiB, done. > Total 8 (delta 6), reused 0 (delta 0) > error: refname 'GNOME_0_30_PATCHES' is ambiguous > To ssh://vasude...@git.gnome.org/git/gnome-applets >b070247..2e3a419 master -> master > error: refname 'GNOME_0_30_PATCHES' is ambiguous > d...@narayana:~/git/gnome-applets/po$ > As far as I understand, this error is due to the fact that a tag and a branch have the same name. I just verified this is the case. Apart from that, your commit has been pushed successfully. By looking at http://git.gnome.org/cgit/gnome-applets/ you can verify your commit was added, http://git.gnome.org/cgit/gnome-applets/commit/?id=2e3a4191b2ee413c53083b8d5b7e4aeca73eb615 Simos ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
Hello, > Apart from that, your commit has been pushed successfully. > By looking at http://git.gnome.org/cgit/gnome-applets/ > you can verify your commit was added, > http://git.gnome.org/cgit/gnome-applets/commit/?id=2e3a4191b2ee413c53083b8d5b7e4aeca73eb615 By the way, Tirumurti, did you really mean to use "/n" rather than "\n" in that string? -- Gintautas Miliauskas ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
sir, you mean in the translator credits string? no, i did not mean to. simply followed what was there earlier. since you mentioned it is wrong, am i right? will correct it if you say so. regards tv On Thu, May 21, 2009 at 5:44 PM, Gintautas Miliauskas wrote: > By the way, Tirumurti, did you really mean to use "/n" rather than > "\n" in that string? > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
Hello, >> By the way, Tirumurti, did you really mean to use "/n" rather than >> "\n" in that string? > > you mean in the translator credits string? no, i did not mean to. > simply followed what was there earlier. > since you mentioned it is wrong, am i right? > will correct it if you say so. "\n" will show up as a linebreak, while "/n" will show up, well, as "/n". I am pretty sure you want linebreaks there, so yes, I suggest you correct it. Best regards, -- Gintautas Miliauskas ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On Fri, May 22, 2009 at 12:50 AM, Gintautas Miliauskas wrote: > > "\n" will show up as a linebreak, while "/n" will show up, well, as > "/n". I am pretty sure you want linebreaks there, so yes, I suggest > you correct it. > > i will. thanks regards tv -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
the latest --- d...@narayana:~$ cd git d...@narayana:~/git$ cd evolution/po d...@narayana:~/git/evolution/po$ git status # On branch master nothing to commit (working directory clean) d...@narayana:~/git/evolution/po$ intltool-update ta xgettext: error while opening "./../addressbook/gui/widgets/eab-vcard-control.c" for reading: No such file or directory ERROR: xgettext failed to generate PO template file. Please consult error message above if there is any. -- can please someone translate this into english? :-)) > thanks > regards > tv > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
Le samedi 23 mai 2009 à 14:05 +0530, Tirumurti Vasudevan a écrit : > the latest > --- > d...@narayana:~$ cd git > d...@narayana:~/git$ cd evolution/po > d...@narayana:~/git/evolution/po$ git status > # On branch master > nothing to commit (working directory clean) > d...@narayana:~/git/evolution/po$ intltool-update ta > xgettext: error while opening > "./../addressbook/gui/widgets/eab-vcard-control.c" for reading: No > such file or directory > ERROR: xgettext failed to generate PO template file. Please consult >error message above if there is any. > -- > can please someone translate this into english? > :-)) > The error is also shown here: http://l10n.gnome.org/module/evolution/ Developers often forget to update POTFILES.in/skip when they remove/rename files. If you know what you're doing, you can update it yourself, or enter a bug on Bugzilla, or find the author of the faulty change and poke him, or wait someone else fix the problem, or or... Claude ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
Hi! > d...@narayana:~/git/evolution/po$ intltool-update ta > xgettext: error while opening > "./../addressbook/gui/widgets/eab-vcard-control.c" for reading: No > such file or directory > ERROR: xgettext failed to generate PO template file. Please consult >error message above if there is any. Does the file exist? If not, probably POTFILES.in needs to be updated if it mentions that file. Try intltool-update -m, it might give you some hints. Regards, Johannes > > > > -- > My blogs: [all in Tamil] > http://anmikam4dumbme.blogspot.com/ > http://chitirampesuthati.blogspot.com/ photo blog now with english > text too! > http://kathaikathaiyaam.blogspot.com/ > > BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! > ___ > gnome-i18n mailing list > gnome-i18n@gnome.org > http://mail.gnome.org/mailman/listinfo/gnome-i18n signature.asc Description: Dies ist ein digital signierter Nachrichtenteil ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
hihihi no i wont provoke him. after all everyone is working hard giving their free time enough to know that i have not done something wrong. tv On Sat, May 23, 2009 at 2:14 PM, Claude Paroz wrote: > Developers often forget to update POTFILES.in/skip when they > remove/rename files. > If you know what you're doing, you can update it yourself, or enter a > bug on Bugzilla, or find the author of the faulty change and poke him, > or wait someone else fix the problem, or or... > -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
On 5/23/09, Tirumurti Vasudevan wrote: > hihihi > no i wont provoke him. > after all everyone is working hard giving their free time > enough to know that i have not done something wrong. > tv Reporting a bug in Bugzilla is not "provoking". Reporting a bug in Bugzilla makes it possible for lots of people to know there is a problem and track the status of it, and makes it easier for someone to eventually fix the problem. If you do not know about a problem, you can never fix it, so reporting a bug is doing something good. Look at it the other way: If you know something is wrong, but do not report it in Bugzilla, and lots of other people/translators in the same situation do the same, how will bugs ever get fixed? Christian ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
Re: problem with git
you are right sir! just that i am only a translator and have not much tech knowledge so i am a little wary of doing things like that. well i wrote a mail to the concerned person to have a look at the problems. regards tv On Sat, May 23, 2009 at 4:45 PM, Christian Rose wrote: > how will bugs ever get fixed? -- My blogs: [all in Tamil] http://anmikam4dumbme.blogspot.com/ http://chitirampesuthati.blogspot.com/ photo blog now with english text too! http://kathaikathaiyaam.blogspot.com/ BE HAPPY! LIFE IS TOO SHORT TO BE UNHAPPY! ___ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
