Re: pgsql: Translation updates
От | Alvaro Herrera |
---|---|
Тема | Re: pgsql: Translation updates |
Дата | |
Msg-id | 20141216040334.GS1768@alvh.no-ip.org обсуждение исходный текст |
Ответ на | Re: pgsql: Translation updates (Euler Taveira <euler@timbira.com.br>) |
Список | pgsql-committers |
Euler Taveira wrote: > On 15-12-2014 23:07, Alvaro Herrera wrote: > > Peter Eisentraut wrote: > >> On 12/15/14 4:28 PM, Euler Taveira wrote: > >>> On 15-12-2014 18:17, Peter Eisentraut wrote: > > > >>>> The files messages/pt_BR/initdb.po and > >>>> postgresql/src/bin/initdb/po/pt_BR.po are identical, so I think there is > >>>> nothing new to copy. > >>>> > >>> And the other ones? > >> > >> I didn't check the other ones. Are they not up to date? > > > > Well, they are now, because I committed some updates. But as Tom > > noticed, one commit was missing too, which is odd. Can we have the > > postgresql.git commit message carry the pgtranslation/messages.git > > commit ID perhaps? > > > I committed [1] a few hours ago and it is not the last commit in master. > Perhaps you did not 'git pull' my last commit and copy those other > spanish po files from elsewhere? > > [1] > http://git.postgresql.org/gitweb/?p=pgtranslation/messages.git;a=commit;h=af90b2e25e8327ba3fd7e1a6c795da63f9b0c7d3 Oh, I think I see my mistake --- I have several checked-out copies, one which is the workspace for each branch (so I have messages-master and messages-9.3-branch, etc back to 9.0) and a main one that receives all the branch-specific updates before I push. Apparently what happened is that I created the final commit in messages-master and then pushed to postgresql.git repo from there, and only later I ran the git push to the main one "messages", where I found the commit you had just created. This is very similar to what I do for the postgresql.git repo (where I have one workspace per branch, plus one additional workspace for each major development project I have), and one "main" copy that's the one that get updates from gitmaster, the one I push onto, and from where I push onto gitmaster. The one difference is that in postgresql.git I have a "bare mirror" repo (git clone --mirror). I think that reduces the likelyhood that I make mistakes of the sort I just made. If we had a pgtranslation/messages.git commit ID in the postgresql.git commit message, we could see whether this is what happened. In messages-master, I have this sequence of commits: 8<-------- 8<-------- 8<-------- 8<-------- 8<-------- 8<-------- commit 4853d024694af32257cf061ff4f214d9dca5f106 Author: Alvaro Herrera <alvherre@alvh.no-ip.org> Date: Mon Dec 15 16:56:06 2014 -0300 es: update pg_ctl, plpython, pg_resetxlog, postgres from Carlos Chapi, Martín Marqués, Álvaro Herrera commit 942efe00950e3c642e9a1b8b85852cfd15e24160 Author: Alvaro Herrera <alvherre@alvh.no-ip.org> Date: Mon Dec 15 15:22:09 2014 -0300 es: update ecpg, psql, plpgsql, pgscripts 8<-------- 8<-------- 8<-------- 8<-------- 8<-------- 8<-------- whereas in messages (the main copy) it's 8<-------- 8<-------- 8<-------- 8<-------- 8<-------- 8<-------- commit f1f61b527d2b9aee9b636fdb8e133a3cb37afe27 Author: Alvaro Herrera <alvherre@alvh.no-ip.org> Date: Mon Dec 15 16:56:06 2014 -0300 es: update pg_ctl, plpython, pg_resetxlog, postgres from Carlos Chapi, Martín Marqués, Álvaro Herrera commit af90b2e25e8327ba3fd7e1a6c795da63f9b0c7d3 Author: Euler Taveira <euler@timbira.com> Date: Mon Dec 15 17:40:00 2014 -0300 pt_BR: translation update commit 942efe00950e3c642e9a1b8b85852cfd15e24160 Author: Alvaro Herrera <alvherre@alvh.no-ip.org> Date: Mon Dec 15 15:22:09 2014 -0300 es: update ecpg, psql, plpgsql, pgscripts 8<-------- 8<-------- 8<-------- 8<-------- 8<-------- 8<-------- Note the different commit ID of the first (most recent) commit, but same timestamp; and your update in the middle which is lacking in the other one. I prolly had to "git rebase". -- Álvaro Herrera http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services
В списке pgsql-committers по дате отправления:
Предыдущее
От: David G JohnstonДата:
Сообщение: Re: pgsql: doc: restrictions on alter database moving default tablespace
Следующее
От: David G JohnstonДата:
Сообщение: Re: pgsql: doc: restrictions on alter database moving default tablespace