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

Re: [TSVN] "Diff" shows expanded keywords as diffs, but "Create patch" and "svn diff" don't

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-02-06 19:13:28 CET

Eric Hanchrow wrote:
> This is the nightly build of Tortoise dated 5 Feb 2005.

Not just that one. That's the case for all versions.

> I have a file which has svn:keywords set to "LastChangedDate
> LastChangedRevision HeadURL". In the repository, the file, not
> surprisingly, includes references to those three keywords, like this:
[snip]
> Now, I've made a tiny edit to this file (I inserted a comment in the
> first line), and I did "svn diff". That yielded exactly the result I
> expected to see:
[snip]
> Finally, the bug: I right-click on the file's Explorer icon, and
> choose "SVN Diff" from the Tortoise menu, but now I see _four_ changed
> lines: the original comment, which I expected, and one line each for
> the three expanded keywords, which I didn't expect. Those extra three
> lines are the bug.

Not a bug!
Settings->Diff/Merge tab, Advanced button. Then there's a checkbox
"Don't convert files when diffing against BASE" - uncheck that box if
you want the keywords to be _not_ expanded when diffing.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Feb 6 19:14:05 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

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