[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Generated file

From: <kfogel_at_collab.net>
Date: 2005-01-05 17:55:39 CET

Kirill Shpitsa <KirillShpitsa@unitech.com.ua> writes:
> Hope that someone can help with an explanation.
>
> Actually, this question is not Subversion specific, but I believe it also
> can be applied to Subversion as well:
>
> Our project contains lots of generated files (think of yacc sources
> compiled into .c). We store those in the version control together with
> their sources (i.e. both .y and .c). Whoever changes the .y file is
> resposible for generating .c file and commiting it together with the .y
> file. Of course, any conflicting changes are resolved on the .y level,
> however, the version control system insists on resolving conflicts with
> generated files. Is there any way to force commit without updating the
> files first (the generated files are quite big and there are a lot of
> them, and it is waste of time and traffic to update them just to
> unconditionally overwrite them anyway). The generated files definately
> need to be stored in the version control system, since: a) they are slow
> to generate (yacc is just an example, in fact it is something different);
> b) not every developer works with .y files and has the knowledge, time, or
> tools to generate them.
>
> Thank you for your attention,

You can set the "svn:mime-type" property on the generated .c files to
"application/octet-stream" or some other non-text mime type, so that
at least Subversion doesn't try to merge them, and always conflicts
when they conflict. There's no way to force commit without resolving
the conflict first, though, which usually involves an update or
something like an update.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 5 18:03:40 2005

This is an archived mail posted to the Subversion Users mailing list.