To get rid of conflicts I think we should remove this file from revision control.
+1
On 11/10/06, Gregory Shimansky <[EMAIL PROTECTED]> wrote:
On Saturday 11 November 2006 01:12 Alexei Fedotov wrote: > > generate this file as part of the build process? > > +1 for autogeneration of version_svn_tag.h It is kind of autogenerated already. To get rid of conflicts I think we should remove this file from revision control. > On 11/10/06, Vladimir Ivanov <[EMAIL PROTECTED]> wrote: > > Hello everyone, > > > > When I do my morning SVN update of drlvm module I see the permanent > > conflict on the version_svn_tag.h file because this file is updated by > > build. > > > > Actually, it is not a big problem while it not breaks vm build. But it > > will be more convenient if these conflicts go out. > > > > Could we generate this file as part of the build process (it has only 4 > > strings)? May be some other solutions exists? > > > > > > > > I'm not too familiar with VM build so I'll be glad if somebody takes care > > about it :) -- Gregory Shimansky, Intel Middleware Products Division
-- Thank you, Alexei
