Re: I get a cvs conflict when updating gtk+.

[Rodrigo Moya <rodrigo gnome-db org>]

On Wed, 2001-12-26 at 09:38, Miles Lane wrote:
> On Wed, 2001-12-26 at 00:29, James Henstridge wrote:
> > Miles Lane wrote:
> > 
> > >Why do I get a conflict when updating 
> > >gtk+/docs/reference/gtk/tmpl/gtktextview.sgml?
> > >This causes the v-b-s to halt the configuration
> > >and compilation process.  If there is a way to prevent
> > >these cvs conflicts, I'd like to help set it up.
> > >
> > That means that your local copy of the file differs from the copy on the 
> > server, and the changes to the version on the server could not be 
> > integrated into your local copy without a conflict.
> 
> Thanks for the reply James.
> 
> Perhaps I asked the wrong question.
> I am wondering why I often see this conflict.  I am
> not modifying this file by hand.  Is this an issue of
> the sgml file getting overwritten by the build process?
> Otherwise, I would expect that cvs would simply update
> or patch the file, instead of ceasing to update the 
> module's files.  Perhaps this file should not be in the
> repository, if it is a built file, rather than source.
> 
although it is a generated file (by gtk-doc), it still contains some
additions, so it needs to be on CVS.

The conflicts you get is because gtk-doc modify them locally.

cheers
-- 
Rodrigo Moya <rodrigo gnome-db org> - <rodrigo ximian com>
http://www.gnome-db.org/ - http://www.ximian.com/