Re: gitk pull request // was: Re: gitk: "lime" color incompatible with older Tk versions

[Junio C Hamano]

Junio C Hamano  writes:

> Paul Mackerras  writes:
>
>>> Paul, is it a good time to pull, or do you still have something not
>>> published yet that should go together with what you have already
>>> queued?
>>
>> I recently pushed out one more commit to update the Russian
>> translation from Dimitriy Ryazantcev.  The head is now 8fef3f36b779.
>> I have a couple more series that I am currently reviewing, but nothing
>> immediately ready to publish.  It would be a good time for you to do a
>> pull, since the "lime" color fix and the memory consumption fixes
>> should be helpful for a lot of people.
>
> Thanks.  I did want to get the memory consumption fix sooner rather
> than later, and this is very much appreciated.
>
> Pulled.

Hmph.  I am getting these:

SUBDIR gitk-git
Generating catalog po/sv.msg
msgfmt --statistics --tcl po/sv.po -l sv -d po/
po/sv.po:1388: duplicate message definition...
po/sv.po:380: ...this is the location of the first definition
msgfmt: found 1 fatal error
make[1]: *** [po/sv.msg] Error 1
make: *** [all] Error 2

Anybody else see this?

Re: gitk pull request // was: Re: gitk: "lime" color incompatible with older Tk versions

[Junio C Hamano]

Paul Mackerras  writes:

>> Paul, is it a good time to pull, or do you still have something not
>> published yet that should go together with what you have already
>> queued?
>
> I recently pushed out one more commit to update the Russian
> translation from Dimitriy Ryazantcev.  The head is now 8fef3f36b779.
> I have a couple more series that I am currently reviewing, but nothing
> immediately ready to publish.  It would be a good time for you to do a
> pull, since the "lime" color fix and the memory consumption fixes
> should be helpful for a lot of people.

Thanks.  I did want to get the memory consumption fix sooner rather
than later, and this is very much appreciated.

Pulled.

Re: gitk pull request // was: Re: gitk: "lime" color incompatible with older Tk versions

[Paul Mackerras]

Hi Junio,

On Sat, Jan 14, 2017 at 06:35:43PM -0800, Junio C Hamano wrote:
> David Aguilar  writes:
> 
> > On Fri, Jan 13, 2017 at 03:20:43AM -0800, David Aguilar wrote:
> >> 
> >> Ping.. it would be nice to get this patch applied.
> >
> > Sorry for the noise, and thank you Paul for the fix.
> > This was already fixed by Paul in gitk@22a713c72df.
> >
> > I'm sure Junio will merge gitk.git into git.git soon enough so I
> > can sit tight until then, but while I'm here I might as well
> > send out a pull request:
> >
> > The following changes since commit 22a713c72df8b6799c59287c50cee44c4a6db51e:
> >
> >   gitk: Follow themed bgcolor in help dialogs (2016-03-19 14:12:21 +1100)
> >
> > are available in the git repository at:
> >
> >   git://ozlabs.org/~paulus/gitk.git 
> >
> > for you to fetch changes up to fbf426478e540f4737860dae622603cc0daba3d2:
> >
> >   gitk: Update copyright notice to 2016 (2016-12-12 20:46:42 +1100)
> 
> Pinging Paul to signal me that his tree is ready to pull from is
> appreciated, and asking Paul if his tree is ready to be pulled and
> then relaying his answer to me is also fine, but I am sensing that
> this message is neither.  So let me double check.
> 
> Paul, is it a good time to pull, or do you still have something not
> published yet that should go together with what you have already
> queued?

I recently pushed out one more commit to update the Russian
translation from Dimitriy Ryazantcev.  The head is now 8fef3f36b779.
I have a couple more series that I am currently reviewing, but nothing
immediately ready to publish.  It would be a good time for you to do a
pull, since the "lime" color fix and the memory consumption fixes
should be helpful for a lot of people.

Thanks,
Paul.

Re: gitk pull request // was: Re: gitk: "lime" color incompatible with older Tk versions

[Junio C Hamano]

David Aguilar  writes:

> On Fri, Jan 13, 2017 at 03:20:43AM -0800, David Aguilar wrote:
>> 
>> Ping.. it would be nice to get this patch applied.
>
> Sorry for the noise, and thank you Paul for the fix.
> This was already fixed by Paul in gitk@22a713c72df.
>
> I'm sure Junio will merge gitk.git into git.git soon enough so I
> can sit tight until then, but while I'm here I might as well
> send out a pull request:
>
> The following changes since commit 22a713c72df8b6799c59287c50cee44c4a6db51e:
>
>   gitk: Follow themed bgcolor in help dialogs (2016-03-19 14:12:21 +1100)
>
> are available in the git repository at:
>
>   git://ozlabs.org/~paulus/gitk.git 
>
> for you to fetch changes up to fbf426478e540f4737860dae622603cc0daba3d2:
>
>   gitk: Update copyright notice to 2016 (2016-12-12 20:46:42 +1100)

Pinging Paul to signal me that his tree is ready to pull from is
appreciated, and asking Paul if his tree is ready to be pulled and
then relaying his answer to me is also fine, but I am sensing that
this message is neither.  So let me double check.

Paul, is it a good time to pull, or do you still have something not
published yet that should go together with what you have already
queued?

Thanks.

>
> 
> Markus Hitter (3):
>   gitk: Turn off undo manager in the text widget
>   gitk: Remove closed file descriptors from $blobdifffd
>   gitk: Clear array 'commitinfo' on reload
>
> Paul Mackerras (2):
>   gitk: Use explicit RGB green instead of "lime"
>   gitk: Update copyright notice to 2016
>
> Rogier Goossens (3):
>   gitk: Add a 'rename' option to the branch context menu
>   gitk: Allow checking out a remote branch
>   gitk: Include commit title in branch dialog
>
> Satoshi Yasushima (1):
>   gitk: Fix Japanese translation for "marked commit"
>
> Stefan Dotterweich (1):
>   gitk: Fix missing commits when using -S or -G
>
> Vasco Almeida (2):
>   gitk: Makefile: create install bin directory
>   gitk: Add Portuguese translation
>
>  Makefile|1 +
>  gitk|  166 +--
>  po/bg.po|4 +-
>  po/ca.po|6 +-
>  po/de.po|4 +-
>  po/es.po|4 +-
>  po/fr.po|4 +-
>  po/hu.po|4 +-
>  po/it.po|4 +-
>  po/ja.po|   13 +-
>  po/pt_br.po |4 +-
>  po/pt_pt.po | 1376 
> +++
>  po/ru.po|4 +-
>  po/sv.po|8 +-
>  po/vi.po|4 +-
>  15 files changed, 1549 insertions(+), 57 deletions(-)
>  create mode 100644 po/pt_pt.po
>
> Thanks,

gitk pull request // was: Re: gitk: "lime" color incompatible with older Tk versions

[David Aguilar]

On Fri, Jan 13, 2017 at 03:20:43AM -0800, David Aguilar wrote:
> 
> Ping.. it would be nice to get this patch applied.

Sorry for the noise, and thank you Paul for the fix.
This was already fixed by Paul in gitk@22a713c72df.

I'm sure Junio will merge gitk.git into git.git soon enough so I
can sit tight until then, but while I'm here I might as well
send out a pull request:

The following changes since commit 22a713c72df8b6799c59287c50cee44c4a6db51e:

  gitk: Follow themed bgcolor in help dialogs (2016-03-19 14:12:21 +1100)

are available in the git repository at:

  git://ozlabs.org/~paulus/gitk.git 

for you to fetch changes up to fbf426478e540f4737860dae622603cc0daba3d2:

  gitk: Update copyright notice to 2016 (2016-12-12 20:46:42 +1100)


Markus Hitter (3):
  gitk: Turn off undo manager in the text widget
  gitk: Remove closed file descriptors from $blobdifffd
  gitk: Clear array 'commitinfo' on reload

Paul Mackerras (2):
  gitk: Use explicit RGB green instead of "lime"
  gitk: Update copyright notice to 2016

Rogier Goossens (3):
  gitk: Add a 'rename' option to the branch context menu
  gitk: Allow checking out a remote branch
  gitk: Include commit title in branch dialog

Satoshi Yasushima (1):
  gitk: Fix Japanese translation for "marked commit"

Stefan Dotterweich (1):
  gitk: Fix missing commits when using -S or -G

Vasco Almeida (2):
  gitk: Makefile: create install bin directory
  gitk: Add Portuguese translation

 Makefile|1 +
 gitk|  166 +--
 po/bg.po|4 +-
 po/ca.po|6 +-
 po/de.po|4 +-
 po/es.po|4 +-
 po/fr.po|4 +-
 po/hu.po|4 +-
 po/it.po|4 +-
 po/ja.po|   13 +-
 po/pt_br.po |4 +-
 po/pt_pt.po | 1376 +++
 po/ru.po|4 +-
 po/sv.po|8 +-
 po/vi.po|4 +-
 15 files changed, 1549 insertions(+), 57 deletions(-)
 create mode 100644 po/pt_pt.po

Thanks,
-- 
David