Re: problem with git

[Simos Xenitellis <simos lists googlemail com>]

On Fri, May 8, 2009 at 12:43 PM, Tirumurti Vasudevan <agnihot3 gmail com> wrote:
> sir my problems persist.
> i tried with a new file.
> going by the book.
> well almost...
>
> fails to get pushed.
> -------------------------
> drtv narayana:~/git$ cd gnome-applets/
> drtv 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.

> drtv narayana:~/git/gnome-applets$ intltool-update ta
> intltool-update: Unable to proceed.
> Make sure to run this script inside the po directory.
> drtv narayana:~/git/gnome-applets$ cd po
> drtv narayana:~/git/gnome-applets/po$ intltool-update ta
> .................................................................................
> done.
> 792 translated messages, 1 fuzzy translation, 1 untranslated message.
> drtv narayana:~/git/gnome-applets/po$ git status
> # On branch master
> # Changed but not updated:
> #   (use "git add <file>..." to update what will be committed)
> #
> #       modified:   ta.po
> #
> # Untracked files:
> #   (use "git add <file>..." 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")
> drtv 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(-)
> drtv narayana:~/git/gnome-applets/po$ git push
> To ssh://vasudeven git gnome org/git/gnome-applets
>  ! [rejected]        master -> master (non-fast forward)
> error: failed to push some refs to
> 'ssh://vasudeven git gnome org/git/gnome-applets'
> drtv 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 <agnihot3 gmail com>
> 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!
>