Re: gettext->gnulib sync conflicts

[Bruno Haible]

Hi Karl,

Sorry for not having replied to your first mail on this topic.

> gnulib has been synced against gettext releases, not gettext dev.
> This was a change I made at Daiki's suggestion a couple years ago.

I fully support this: the maintainer of a package needs the ability to
have unstable changes in their git tree, without risking that they
cause trouble in other projects.

However, in periods where only small and safe changes are being made,
it's OK to propagate unreleased changes into gnulib, because a couple
of people are watching here with scrutiny.

> Bruno, you updated iconv.m4 in the gettext dev repo with your change
> made in gnulib. 
> ...
> I guess the immediate alternative is to stop syncing iconv.m4

Yes, please. The iconv.m4 change I would consider stable.
=> Stop syncing iconv.m4 with gettext for the moment.

> So I tried a sync of gnulib against gettext dev
> (./config/srclist-update<config/srclist.txt), and a new difference
> shows up, for Makefile.in.in.  Diff below.
> 
> The changes in gettext's .in.in look reasonable to install now

This particular change is also safe and stable. I wouldn't mind to
copy it into gnulib; it helps translators.

> to start syncing from gettext dev instead of gettext releases), but I
> felt you or Daiki or someone should confirm. ?

Daiki needs to decide. It depends on what kind of changes he'll do in
gettext next, and whether he is as shy as I am :)

Bruno