On Wed, Aug 13, 2008 at 8:57 PM, Michael Maxwell <mmaxwell_at_casl.umd.edu> wrote:
>> On Wed, Aug 13, 2008 at 2:05 PM, Michael Maxwell
>> <mmaxwell_at_casl.umd.edu> wrote:
>> >> The problem with keyword expansion comes when you do diffs and
>> merges.
>> >
>> > Since svn has its own built-in diff, why can't it do a diff (and merge) with
>> unexpanded keywords?
>>
>> For the same reason why CVS and RCS -- which both by expand keywords
>> by default-- can't ignore the differences between expanded keywords.
>
> I don't understand: CVS and RCS don't have their own built-in diff programs; svn does. It could therefore dump the two versions of some file that it's comparing to some place in /tmp or wherever (as I would guess it already does) with the *unexpanded* keywords, and run its diff over those versions.
svn already unexpands keywords, but only if you told it to expand them
in the first place.
HTH,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-13 21:02:09 CEST