hal: Branch 'master' - 2 commits

David Zeuthen david at fubar.dk
Sun Sep 10 14:40:20 PDT 2006


On Sun, 2006-09-10 at 17:36 -0400, David Zeuthen wrote:
> On Sun, 2006-09-10 at 22:34 +0100, Richard Hughes wrote:
> > Do the sgml files *have* to be in git? Every time I re-autogen I get
> > conflicts against head due to slightly different versions of stuff.
> 
> I'm not really sure, I wished they didn't but gave up fighting it as I
> generally dislike build systems. Adding mclasen as Cc, maybe he knows?

Eh, maybe I snipped too much. To give some context to the discussion
we're talking about the sgml files used by gtk-doc. E.g. these

> diff --git a/doc/api/tmpl/hald_runner.sgml
> b/doc/api/tmpl/hald_runner.sgml
> index 70ff5ff..9537d0a 100644
> --- a/doc/api/tmpl/hald_runner.sgml
> +++ b/doc/api/tmpl/hald_runner.sgml
> @@ -81,6 +81,9 @@ hald_runner
>  @device: 
>  @command_line: 
>  @extra_env: 
> + at cb: 
> + at data1: 
> + at data2: 
>  @Returns: 

So the question is whether we need these files under version control?

HTH,
David




More information about the hal-commit mailing list