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

Re: Please support diffs from svnlook

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-01-18 18:25:26 CET

Alexander A. Shtuchkin wrote:
> Hello all! Thanks for such a wonderful product!
>
> Here's one problem: svnlook utility generates slightly different "diff"
> files that looks like this:
>
> Modified: trunk/build.proj
> ===================================================================
> --- trunk/build.proj 2007-01-17 15:00:04 UTC (rev 5768)
> +++ trunk/build.proj 2007-01-17 15:02:03 UTC (rev 5769)
> @@ -13,9 +13,8 @@
> ......
>
> Instead of (from svn diff):
>
> Index: trunk/build.proj
> ===================================================================
> --- trunk/build.proj (revision 5768)
> +++ trunk/build.proj (revision 5769)
> @@ -13,9 +13,8 @@
> .....

This is from 'svn diff' on a working copy?

The problem with those diffs is that they don't have a working copy path
to work with. TortoiseMerge needs a working copy path so it knows where
to apply the patch.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 18 18:25:44 2007

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