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

Re: Delphi .RES and version info

From: Steve Williams <stevewilliams_at_kromestudios.com>
Date: 2005-09-21 06:45:23 CEST

Miles Izzo wrote:
> We are using Subversion with Delphi (version 7 - we started with 2005
> but it was too unstable) and we're storing version (ie, build number)
> information in the .RES file (which Delphi does automatically). Is there
> some 'good' recommended way of using Subversion with these resource
> files?
>
> AFAICS, if I commit a .RES file with, say, build 1000 where previously
> it was 990 and my colleague commits a build file with 998 (ie, he did 8
> builds and I did 10 builds) we will get a conflict. Really, the build
> number should go to 1008 (his 8 builds plus my 10 builds) shouldn't it?
> Is there any way to make Subversion work well with these (binary) .RES
> files? Should I just forget about trying to use them with Subversion?

There is no way to automatically handle that, even for Subversion. One
person will have to overwrite the other person's changes.

-- 
Sly
This message and its attachments may contain legally privileged or confidential information. This message is intended for the use of the individual or entity to which it is addressed. If you are not the addressee indicated in this message, or the employee or agent responsible for delivering the message to the intended recipient, you may not copy or deliver this message or its attachments to anyone. Rather, you should permanently delete this message and its attachments and kindly notify the sender by reply e-mail. Any content of this message and its attachments, which does not relate to the official business of the sending company must be taken not to have been sent or endorsed by the sending company or any of its related entities. No warranty is made that the e-mail or attachment(s) are free from computer virus or other defect.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 21 06:47:38 2005

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