[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 4464]  diff repo to wc diff against a copy with --show-copies-as-adds is busted
From:       rhuijben () tigris ! org
Date:       2014-01-26 11:43:40
Message-ID: 20140126114340.C648E54004F () sc157-tigr ! sjc ! collab ! net
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=4464






------- Additional comments from rhuijben@tigris.org Sun Jan 26 03:43:40 -0800 2014 -------
I wouldn't be surprised if all this is caused by driving the editor in an 
unsupported way.

The repos-wc diff reporter is not driven by the wc crawler for this specific 
scenario, while the editor that receives the changes is just the standard 
editor.

All working copy editors assume that the changes they receive are against the 
BASE layer (=lowest / as checked out), while in this case the diff you want to 
show is probably against WORKING (= the copied thing).

We abuse 'svn diff' in far too many ways to really fix this without breaking 
any of the existing dozen use cases.

svn diff ^/foo bar --show-copies-as-adds

would usually show what is in the repository at location BAR against what you 
have in your local working copy. But you have a copy in your local working copy.

So what do you want to see?

A delete of everything at ^/foo (as BASE doesn't exist) and everything you have 
local as addition (the show copies-as adds)?

Or something magic with the copyfrom source of bar?
Or a combination of both?

I think what you see is some form of the last... a delete of the repository 
side... and your local copies as additions. If you wouldn't use --show-copies-
as-adds you probably see the same deletes, but the copies diffed against their 
pristine (=pre copy) version.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=3072087

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]