[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: BUG? One submit a new file, another set new file with the same name, and update before submit, then merge is trigged

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 4 Jun 2010 11:07:42 +0100

On 4 June 2010 09:34, Luc Ye <luc2ye_at_gmail.com> wrote:
> Two places are both up to date, such as version (R345).
>
> One (A) create a new file name a.docx and submitted it, then the version
> will be R346.
>
> The other (B) create a new file name a.docx with different content. then B
> updated the folder before submit, B should get the version R346, and a
> conflict is expected, but in fact, a.docx is emerged automatically, and the
> content of a.docx is still the same as B original without any upate from A.
>
> Is this a bug, or unporper operate? I need help!
>
> ps: not only docx, actually txt, ppt, doc, have the same problem

That is expected behaviour, although there is no merge happening. The
file from the repository becomes the BASE revision and your local copy
then appears as a modified version.

There is an option in the trunk build to defeat this and force a
conflict, but you will not see that in 1.6.x

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2616807
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-04 12:07:56 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.