Re: Tree conflicts case 4 - inching forwards

Simon Large wrote:
> Hi Stefan,
>
> In case 4 where Dev B tries to merge a change into a file which has
> already been deleted, the text on the resolve button "remove the file"
> seems a little perverse. How do I remove something that isn't there? I
> think this should simply be "Mark as resolved".
>
> The advisory text says:
> "Check the log to find out how the file/folder got renamed/moved and
> decide whether you want to keep your rename/move or the one from the
> repository."
>
> In this case there is no rename from the repository, it is trying to
> merge an edit, so I suggest:
> "Check the log to find out how the file/folder got renamed/moved and
> decide whether you want to merge the change into your renamed file, or
> restore the original file."

Done in r15580.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=1275904
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].