My understanding is that expanded keywords are not considered in svn diff, commit, etc, and it's more like a local visual piece of information.
>From [1], here is a little info on the subject. "Keywords and Spurious Differences The user-visible result of keyword substitution might lead you to think that every version of a file with that feature in use differs from the previous version in at least the area where the keyword anchor was placed. However, this is actually not the case. While checking for local modifications during svn diff, and before transmitting those local modifications during svn commit, Subversion "un-substitutes" any keywords that it previously substituted. The result is that the versions of the file that are stored in the repository contain only the real modifications that users make to the file." [1] http://svnbook.red-bean.com/en/1.1/ch07s02.html On Wed, Apr 23, 2008 at 5:45 AM, Simon Nash <[EMAIL PROTECTED]> wrote: > Mark Combellack wrote: > > > Hi Simon, > > > > Have you recently changed your Subversion configuration file to enable SVN > > keyword expansion? The file in question is located: > > > > Windows %USERPROFILE%\Application Data\Subversion\config > > Linux ~/.subversion/config > > > > The value in question is enable-auto-props. If this is set to yes then it > > will expand keywords. By default this value is set to no. > > > > There were discussions on the dev list about this around the end of March > > beginning of April. See: > > > > http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg29637.html > > http://www.mail-archive.com/tuscany-dev@ws.apache.org/msg29781.html > > These discussions suggested changing the SVN config to enable keyword > > expansion. > > > > Perhaps this is the cause of the problem? > > > > Mark > > > > > Thanks for the explanation. If I understand this correctly, this > configuration setting will cause these keywords to expand differently > every time an update is made to the file. This will cause problems > when applying a patch derived from an earlier checked out version > of the file to a later checked out version, if the patch happens to > include this line and if any updates have been made elsewhere in > the file between the two checkouts. > > This won't occur very often, but it did happen to me today, and it > is a nuisance having to work around it by reverse engineering the > patch. > > Simon > > > > > > > > > -----Original Message----- > > > From: Simon Nash [mailto:[EMAIL PROTECTED] > > > Sent: 23 April 2008 10:16 > > > To: tuscany-dev > > > Subject: SVN version keyword expansion > > > > > > On April 1, I checked out a file from SVN. Its version keywords > > > were not expanded in my local copy. Yesterday I checked out the > > > same file and the version keywords were expanded. This caused my > > > attempt to apply a patch (derived from the previous checkout) > > > to fail. > > > > > > The file when viewed in SVN contains the header line > > > * @version $Rev$ $Date$ > > > My previous local checkout had the identical line. My current > > > local checkout has the line > > > * @version $Rev: 643696 $ $Date: 2008-04-02 04:24:11 +0100 (Wed, 02 Apr > > > 2008) $ > > > > > > What is causing this line to now get expanded in my local checked out > > > copy, and why wasn't it expanded when I checked it out previously? > > > > > > Simon > > > > > > > > > > > > > > > > -- Luciano Resende Apache Tuscany Committer http://people.apache.org/~lresende http://lresende.blogspot.com/
