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

Re: Another 'patch' bug

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 29 Nov 2013 17:50:42 +0100

On 29.11.2013 14:19, Paul wrote:
> I just updated to
>
> TortoiseSVN 1.8.4, Build 24972 - 64 Bit , 2013/11/24 11:15:39
>
> today as I was having problems with creating patch files, and I found
> another issue.
>
> We recently merged a lot of code from a feature branch to trunk.
> I'm creating patch files for changes in trunk, but the patch files show
> the files we merged in as delete/add, rather than diff.
>
> If I run "svn diff" on the files it produces a diff.
>
> Looks like Tortoise isn't respecting file ancestry correctly.

Yes, when you create a patch with TSVN, it shows copies as adds. That's
actually wanted that way.
Because patches are usually used to send to someone else (otherwise
using the svn commands is preferred). So when you create a patch from
something you've merged, the patch is created as if the source of the
merge is not available, therefore copies are shown as adds.
Because the person you send the patch to might not have access to your
merge source.

If you want a diff, not a patch, use the Check-for-modifications dialog,
select the files, right-click and chose "create unified diff".

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3069433
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-11-29 17:50:49 CET

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