[GRASS-dev] Re: locale Makefile backport

Glynn Clements glynn at gclements.plus.com
Sun Oct 12 08:13:12 EDT 2008


Markus Neteler wrote:

> > OTOH, 6.4 is likely to be around for a while, so it may be better to
> > just backport all of the build-system related changes.
> 
> I would be glad to see that but I won't be able to judge which
> are the relevant changes. Err, would you mind, this time...?

In retrospect, that's probably not feasible.

You would realistically need to merge all of the Makefile changes,
even minor ones, otherwise you get conflicts when trying to merge
later changes. So I started looking through the timeline, and got as
far as:

32169 32691 32705 32706 32707 32734 32772 32773 32844 32847 32857
32982 32983 33002 33011 33016 33017 33022 33038 33050 33072 33087
33098 33129 33130 33135 33141 33171 33485 33486 33830

And that's only up to the end of August.

Then I realised that the changes to the HTML rules would necessitate
renaming description.html to <module>.html, which would also require
merging all of the fixes for broken HTML.

But much of the renaming and fixing the HTML files was done in a few
batches, and some of those files will have been previously modified to
reflect 7.0-specific changes to the code (e.g. loss of interactive
modes, etc).

IOW, 6.4 and 7.0 are now far enough out of sync that large-scale
merging between the two is impractical.

-- 
Glynn Clements <glynn at gclements.plus.com>


More information about the grass-dev mailing list