Re: [PATCH] Revert deleted file: path not found

> Not sure what you mean here exactly, but when you revert a merged
> revision, the merge-info has to stay: you revert the merge, which means
> you accidentally did the merge - by keeping the merge info it's ensured
> that you won't merge that revision again (like if you did a 'record
> merge' to prevent that revision from getting merged).
>
>
'svn merge -c -X ...' and 'svn cp ...' slightly different when dealing with
mergeinfo.
TortoiseSVN may account for this difference and adjust 'svn cp ...' to be
more like reverse merge.

Detailed steps for reproduce problem:

create file in trunk
create branch
modify file in branch
merge branch into trunk.

at this point mergeinfo present only on /trunk:
/branches/br1:2-3

delete file and commit.

try revert deleted file:

1) revert whole changeset (from upper pane of LogDialog)
=> file reverted, mergeinfo not modified

2) revert only file (from lower pane of LogDialog)
=> file reverted, but also mergeinfo applied on this file

C:\temp\z-svn-test\wc.all\trunk>svn diff
...
Property changes on: iota
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/br1/iota:r2-3

In second case revert performed by copy and subversion library add
mergeinfo on copied file. But TortoiseSVN does know that this was revert,
and can safely(?) undo adding mergeinfo.
So overall effect will be like in case 1: file copied but no additional
merge info applied.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3067340

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-28 22:02:23 CET