Re: Question about git

[Simos Xenitellis <simos lists googlemail com>]

On Sun, May 24, 2009 at 7:16 AM, Tirumurti Vasudevan <agnihot3 gmail com> wrote:
> On Sun, May 24, 2009 at 7:04 AM, Tirumurti Vasudevan <agnihot3 gmail com> wrote:
>> yes it is a little difficult to keep track of what has changed since
>> last commit.
>> one has to look at the number of strings of each and every module.
>>
> ----------
> well i made that effort to keep track and found some updates.
>
>  e-g: Evince Document Viewer    master          97  97% (318/3/4)
>
> ok so i want to work at it again.
> i chage to the relevant dir and say ¨git pull --rebase"  as i am supposed to.
> here goes:
> ----
> ...........
> test/test-mime.bin: needs update
> test/test-page-labels.pdf: needs update
> thumbnailer/Makefile.am: needs update
> thumbnailer/evince-thumbnailer-comics.schemas.in: needs update
> thumbnailer/evince-thumbnailer-djvu.schemas.in: needs update
> thumbnailer/evince-thumbnailer-dvi.schemas.in: needs update
> thumbnailer/evince-thumbnailer-ps.schemas.in: needs update
> thumbnailer/evince-thumbnailer.c: needs update
> thumbnailer/evince-thumbnailer.schemas.in: needs update
> refusing to pull with rebase: your working tree is not up-to-date

These files were last modified in 2007.
When you type 'git log thumbnailer/evince-thumbnailer-ps.schemas.in'
you get
...
Date:   Sun Apr 8 15:34:43 2007 +0000
...

It is unclear why they would be modified in your case.

> drtv narayana:~/git/evince/po$ git reset --hard HEAD^
> HEAD is now at f9b57c7 [printing] Fixes crash found by tests

This resets your working copy and takes away the last commit in the process.
It is better just to try 'git reset --hard'.
You would use 'git reset --hard HEAD^' if you know that your latest
commit (which you did yourself and has not been pushed yet to
git.gnome.org) needs to be taken away.

> drtv narayana:~/git/evince/po$ git status
> # On branch master
> # Untracked files:
> #   (use "git add <file>..." to include in what will be committed)
> #
> #       evince.pot
> nothing added to commit but untracked files present (use "git add" to track)

This file should be added to '.gitignore' because Git should not track it.
In any case, you can ignore the file as it is untracked.
I wonder if the maintainer would be OK to add this to .gitignore
directly (without going to bugzilla, etc).

> drtv narayana:~/git/evince/po$ intltool-update ta
> ............................................. done.
> 299 translated messages, 11 fuzzy translations, 15 untranslated messages.
> drtv narayana:~/git/evince/po$
>
> ------------
>
> so the translations done last time are not counted though in damned
> lies it has been.
> so from where is this file updated?
> it says 299 strings not 318 as shown in da.lies
>
> if git reset --hard HEAD^""was a wrong command here, then what would
> be when it refuses to pull?

With 'git reset --hard HEAD^' you removed a commit, and most probably
the commit you did with the translation.
Tell me if http://live.gnome.org/TranslationProject/GitHowTo is
unclear with the instructions when trying to fix the local git
repository.

Cheers,
Simos

>
> pl clarify
> regards
> drtv
> --
> 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
>