Re: git deleted nn.po on commit
- From: Claude Paroz <claude 2xlibre net>
- To: Åsmund Skjæveland <asmund skjaveland bio uio no>
- Cc: GNOME i18n list <gnome-i18n gnome org>
- Subject: Re: git deleted nn.po on commit
- Date: Tue, 27 Dec 2011 10:40:14 +0100
Le lundi 26 décembre 2011 à 16:05 +0100, Åsmund Skjæveland a écrit :
> I updated a translation received from a translator, and committed
> according to what is normal procedure, as far as I can tell. But for
> some reason, git deleted the file.
>
>
> $ git commit --author="Andreas N. <gedemiti gmail com>" -m "Updated Norwegian Nynorsk translation" nn.po
> [master 36ba64d] Updated Norwegian Nynorsk translation
> Author: Andreas N <gedemiti gmail com>
> 1 files changed, 0 insertions(+), 2768 deletions(-)
> delete mode 100644 po/nn.po
>
>
> I don't understand why. I discovered this when the module was listed
> as untranslated in damned-lies after I pushed. I was able to recover
> the file from an emacs backup and re-add the file.
>
>
> $ git add nn.po
> $ git commit --author="Andreas N. <gedemiti gmail com>" -m "Updated Norwegian Nynorsk translation" nn.po
> [master d9ad3cd] Updated Norwegian Nynorsk translation
> Author: Andreas N <gedemiti gmail com>
> 1 files changed, 2758 insertions(+), 0 deletions(-)
> create mode 100644 po/nn.po
> biodrifts-macbook-pro-6:po aasmunds$ git push
> Counting objects: 6, done.
> Delta compression using up to 2 threads.
> Compressing objects: 100% (4/4), done.
> Writing objects: 100% (4/4), 17.26 KiB, done.
> Total 4 (delta 2), reused 0 (delta 0)
> To ssh://git.gnome.org/git/network-manager-applet
> 36ba64d..d9ad3cd master -> master
>
>
> Now damned-lies looks ok, except that the discussion that was there
> has disappeared. Is somebody able to explain what went wrong with git?
> I'm not aware of anything I did to have caused it. git version 1.7.8,
> installed with Fink on OSX Leopard.
Hi Åsmund,
>From our side, the only plausible supposition is that the file nn.po
didn't exist at the time you add/committed it.
Claude
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]