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

Re: Diff unified context lines

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 06 Oct 2008 18:32:51 +0200

Marinel wrote:
> Maybe I wasn't too clear about what I want to do.
> So, here's another try to explain this.
> I created a patch by accessing TortoiseSVN -> SVN Create Patch...
> This generates a unified diff file with 3 lines of context for each
> change.
> I would like to make a setting so that the generated unified file
> contains 10 lines of context for each change.
> I saw that I can alter the subversion configuration by accessing
> TortoiseSVN -> Settings -> General -> Subversion configuration file
> [Edit].
> This actually points me to "c:\Documents and Settings\username
> \Application Data\Subversion\config".
> However, when I changed the diff-cmd to something invalid in the
> subversion config file I noticed that although the command line svn
> was taking the new setting into consideration, Tortoise completely
> ignored that setting. I tested it by accessing again TortoiseSVN ->
> SVN Create Patch... but as I said I got a unified diff with 3 lines of
> context. I would've expected some error.
> So I started thinking that maybe Tortoise SVN is not using the "svn
> diff" utility at all, when it's generating the patch files. The
> mystery is that I couldn't find how it actually generates that unified
> diff and how could I override the default setting: 3 lines of context.
> I should mention that I have TortoiseSVN for Windows.
> I really hope someone can help me on this.

TortoiseSVN deactivates custom diff settings when creating a patch.
Because most users have a custom diff tool configured to do visual diffs
or do something else. When creating a patch, we have to deactivate
those, otherwise we wouldn't get a patchfile in most cases.

And no, it's not possible to configure TSVN to change the number of
context lines, sorry.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-10-06 18:33:14 CEST

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

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