Re: jhbuild failing due to cvs conflicts
- From: Davyd Madeley <davyd madeley id au>
- To: "Gustavo J. A. M. Carneiro" <gjc inescporto pt>
- Cc: Gnome Desktop Development List <desktop-devel-list gnome org>
- Subject: Re: jhbuild failing due to cvs conflicts
- Date: Mon, 30 Oct 2006 03:06:53 +0000
On Sun, 2006-10-29 at 16: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.
> You're probably right that something during build is changing the po
> files, but two things to note:
> 1. I'm not completely sure, but I think this happened also with
> another package, not gst*, though I don't remember the name;
> 2. I certainly never did a "make dist" on any gst package.
I meant this more as an illustrative example of what used to happen when
building GNOME, not with what would cause it in GStreamer.
08B0 341A 0B9B 08BB 2118 C060 2EDD BB4F 5191 6CDA
] [Thread Prev