Re: tigris 'update' bug???

On 20 June 2012 18:00, Eugen Konkov <kes-kes_at_yandex.ru> wrote:
> Hi.
> 1. I have co and do some modifications
> 2. I try commit, but ocasionally reporsitory were modified
> 3. I update WC
> 4. I commit modifications
> 5. But now I notice that WC has no modifications from others, but I
> expected that they were applied.
>
> I see 'diff' and 'diff with previous version'.
> And I see that WC is different for two commands
> How that can be? I am confused, but I suggest that it must be called
> not WorkingCopy in "DIFF with previous verion" intead must be revision 199
> is not?

Diff shows the difference between your working copy and and the
working base that the file was last updated to.
Diff with previous shows the difference between your working copy and
working base - 1. You can see that from the titles in the screenshots.

When you update, your colleagues changes are merged into your working
copy AND the working base is updated, so you will not see their
changes in the diff, only your own. You will see them in diff with
prev, assuming those changes were made in the previous commit.

> see screenshots for details.
> During 'update' process commetns were lost. EXPECTED: they must be
> merged into WC.

Your screenshots are show different areas of the file (look at the
line numbers) so I am not sure what you are trying to show here.

Simon

-- 
:       ___
:  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=2972270
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].