[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: Greg Thomas <thomasgd_at_omc.bt.co.uk>
Date: 2005-09-29 14:41:07 CEST

On Wed, 28 Sep 2005 18:59:27 +0300, Assaf Lavie <assaflavie@gmail.com>

>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.

To answer your question - you can't. Perhaps this file shouldn't be
version controlled at all - can you use the subversion revision number
(see http://subversion.tigris.org/faq.html#version-value-in-source)


This post represents the views of the author and does
not necessarily accurately represent the views of BT.
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 29 15:15:44 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.