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

Re: Odd diff problem with replaced files

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 04 Jun 2015 19:42:08 +0200

On 04.06.2015 01:42, Gavin Lambert wrote:
> Using TSVN 1.8.7, I encountered the following odd problem:
>
> 1. Right-click-dragged "SVN Copy versioned files" some items from a working copy on one branch to a working copy on another branch. (And yes, the copy was intended, I don't want to merge.)
>
> 2. Check for modifications.
>
> a. SVN status for the files is now showing as "replaced (+)", as expected.
>
> b. Double-click on the file shows no differences. (This seems wrong.)

yes, it is. But there's nothing I can do to fix this.
It's the svn API that returns the wrong pristine copy for the file here,
and exporting the base revision of the file doesn't work either. There's
a comment in the svn source that indicates why:

### TODO: Handle replaced nodes properly.
### svn_opt_revision_base refers to the "new"
### base of the node. That means, if a node is locally
### replaced, export skips this node, as if it was locally
### added, because svn_opt_revision_base refers to the base
### of the added node, not to the node that was deleted.
### In contrast, when the node is copied-here or moved-here,
### the copy/move source's content will be exported.
### It is currently not possible to export the revert-base
### when a node is locally replaced. We need a new
### svn_opt_revision_ enum value for proper distinction
### between revert-base and commit-base.

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=3120909
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-06-04 19:42:13 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.