Re: [TSVN] Re: Handling after a merge

Simon Large wrote:
> Thomas Börkel wrote:
>
>>Is this now reproducable for you with my repro steps below?
>
>
> Yes it is. I used file:/// access and the result is the same.
>
> Changes from the repository have been merged into an unmodified local
> file. The merge progress dialog says that the file is updated when in
> fact it is merged. It should be possible to do a diff from this dialog,
> but because the status is shown incorrectly it is not allowed.

I guess I should have answered this thread earlier:
Yes, the 'action' shown for that file is 'updated' and not 'merged'.
That's correct that way.
'Merged' only shows if modifications from the repository have to be
merged with your own local modifications. If there are no local
modifications, your file in the working copy is 'updated' to the state
of the repository - no merging has to be done for that.
The CL client also shows 'U' for such a file and not 'M'.
So it's shown correctly, but the doubleclick doesn't work because
'update' for updates leaves no modifications to the working base, but
'update' for merges actually does.

hmmm - seems I have to make some adjustments to the TSVN code to differ
between updates and merges...

Done in revision 1969.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org