Re: jhbuild failing due to cvs conflicts

[Davyd Madeley <davyd madeley id au>]

On Sun, 2006-10-29 at 12:43 +0000, Gustavo J. A. M. Carneiro wrote:

>   However, there's one more major problem standing in our way to smooth
> jhbuilding.  It seems that many modules are still producing cvs
> conflicts in po files. For example:

>   I am _sure_ I didn't personally change any gstreamer po file; logic
> dictates that I should not therefore be penalized by cvs conflicts.
> What's happening here?  Can it be fixed?

(At a guess) They're being changed when you build. Something is running
an intltool merge. I thought we had stopped this behaviour from
happening (it used to always happen with make dist). Of course, this is
GStreamer, so their build system probably runs a little differently.

--d

-- 
Davyd Madeley

http://www.davyd.id.au/
08B0 341A 0B9B 08BB 2118  C060 2EDD BB4F 5191 6CDA