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

BUG? Submit a new file, the other set new file with the same name, update, got merge automatically

From: yezhelu <yezhelu_at_gmail.com>
Date: Fri, 4 Jun 2010 02:08:18 -0700 (PDT)

Two places are both up to date, such as version (R345).

One (A) create a new file name a.docx with some content 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 imporper operate? I need help!

ps: not only docx, actually txt, ppt, doc... have the same problem

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-04 11:58:14 CEST

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