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

Re: howto? specify non-mergability for a file

From: Unspammable <unspammable_at_gmail.com>
Date: 2005-09-30 09:17:18 CEST

On 9/29/05, Greg Thomas <thomasgd@omc.bt.co.uk> wrote:
>
> On Wed, 28 Sep 2005 18:59:27 +0300, Assaf Lavie <assaflavie@gmail.com>
> wrote:
>
> >Can I mark this file as "always use newer version - never merge" somehow?
>
> Define "newer". Do you mean timestamp, or as I suspect, "the version
> of the file which has the largest build number in it". If the latter,
> you may get an idea of the complexity of the problem.

Yes, you assumed correctly. However, I'm willing to settle for the former
(timestamp).
How would I go about telling SVN to always prefer the latest file?

To answer your question - you can't. Perhaps this file shouldn't be
> version controlled at all

The build number indicates (roughly) how many times the project was built,
and is somewhat useful as such.
If it's not under source control the number would be a very poor indicator.

- can you use the subversion revision number
> (see http://subversion.tigris.org/faq.html#version-value-in-source)
> instead?

I'm not sure. I doubt it. The file containing the build number must be
updated before the build takes place. The revision number is updated when
the file is commited, correct? This will create a discrepancy between the
revision number and the version string attached to the executable.

[snip]
Received on Fri Sep 30 09:19:57 2005

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