You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Lieven Govaerts <lg...@mobsol.be> on 2006/10/24 22:08:36 UTC

[PATCH] issue 2640 - $Author:$ is not considered an expanded form

Hi,

attached is a patch for issue 2640. The issue is about keywords like
$Author:$ that don't have a space between ':' and '$'. Subversion
currently considers $Author:$ to be unexpanded, which can give some
weird diff results (as shown in the issue).

This behavior is apparently intended, as it was added explicitly in
r4271. Looking at the log message, the reasoning appears to be:
a. it has to be either expanded or unexpanded, not something undefined.
b. RCS considers $Author:$ an unexpanded form, so let's do the same thing.

I had a discussion with Erik on IRC about this, and to both of us it
seemed more correct to change current behavior. What do other people
think about this?

Lieven.

[[[
Fix for issue 2640. The patch basically reverts r4271, and adds the
'$Keyword:$ is considered an expanded form' behavior.

* subversion/libsvn_subr/subst.c
  (translate_keyword_subst): consider $keyword:$ expanded instead of
   unexpanded.

* subversion/tests/libsvn_subr/translate-test.c
  (lines): change the testcase in line 46 to this new behavior.
  (substitute_and_verify): add the new expected behavior for $keyword:$
   and remove the old one.
]]]