Re: [Lxde-i18n] LXDE git conflict trashed PO file

[Martin B. / b. <br...@bs...>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

To lxde-i18n as info
There are two updated string in PCManFM that translators need to tend to.

The conversation below is just to bring attention to what happens when you
a) forget to commit your work at the end of the session
b) when a developer updates the po files when there are uncommitted
changes at the server

Developers; PLEASE (is this the last time I have to ask?) do NOT update
the po files!
Translators; ALWAYS commit your changes. Better do it one time more than
you planned. The worst case scenario is that your file might end up
truncated.

On 2011-02-14 14:32, Klemen Košir wrote:
> I have commited all the files once again, but I get an error when trying
> to commit pcmanfm package or updating from VCS.

thanks.

> When commiting, I get: "Failed to commit file: [GIT] commit of
> ('/var/lib/pootle/po/lxde/pcmanfm', 'po/sl.po') failed: # On branch
> master # Your branch and 'origin/master' have diverged, # and have 1 and
> 1 different commit(s) each, respectively. # # Untracked files: # (use
> "git add <file>..." to include in what will be committed) # # po/af.po #
> po/am.po # po/bn_IN.po # po/es_VE.po # po/et.po # po/ko.po # po/li.po #
> po/ml.po # po/ms.po # po/nb.po # po/nn.po # po/pcmanfm.pot # po/ps.po #
> po/ro.po # po/si.po # po/ur.po # po/ur_PK.po nothing added to commit but
> untracked files present (use "git add" to track)",

looks like someone pushed changes to the actual files. hate it when it
happens. I'll try to merge your changes into master manually, it might
be really ugly.

something REALLY strange happened there. sl.po got 100% truncated and
the process aborted in a intermediate state.
I have used the HEAD-1 version of your file, applied the patch you
committed to that and readded the strings to the VCS. Please take a new
look at that file.

I'll send a hate mail for this shit.

commit cac3de08801358dc4fb7ddf67bd724c784512a8b
Author: Hong Jen Yee (PCMan) <pcm...@gm...>
Date:   Mon Feb 14 20:00:56 2011 +0800

    * Fix #3139753 - Create New asks for name of new "file" even for a
new folder.
    * Update translations.

that's the commit that fucked us.

> and when trying to update from VCS, I get: "Failed to update
> lxde/pcmanfm/po/sl.po from version control".

this is because you didn't commit the changes, you can not update the
files when they are dirty (changed).

> As for DeaDBeeF, I can't check on GIT if the file got updated, since the
> last commit was in May 2010.

looks like it was committed safely yes.
commit 5353bb22a1c40b45fea0fd4a4e86d0c040a65339
Author: klemenkosir <kle...@gm...>
Date:   Mon Feb 14 14:57:45 2011 +0200

    Commit from LXDE Translation Project with Pootle by user
klemenkosir.: 257 of 257 messages translated (0 fuzzy).

- -- 
brother
http://sis.bthstudent.se
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBCAAGBQJNWT6SAAoJEJbdSEaj0jV7ZvwH/1BEIG9P6uMjlcNKs3Dr+v9t
DBKV8OAavKN+BoXTay8trCsBEswffJFscn70aft/sxBGQwAISg8o+f2HuXTm7snI
RbZmcc6W391D15qAMIw6wHZRB/URnwGeA5ISQg0+PUsSiEZqLPao7llgnut1HTfd
1umh1dr1WLhONwOcL0F/OFwQeuXmLisO11u1X+rvS2rm7kyEW/o6RtkOyDtd4ixC
QkX+Ln8ujst676s6oBBF6OsjwPxLXHKd9WQo+8Ls7B2dAftMzcJjuEFhQpINj8oT
EqGVlymYNQlRpr9x9y1PEMkZvEdWSnwZfTMPc9w6SLVkluKHRDdvF8YAkIBAhgU=
=Gf2m
-----END PGP SIGNATURE-----