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

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

From: Luc Ye <luc2ye_at_gmail.com>
Date: Fri, 4 Jun 2010 16:34:36 +0800

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


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-06-04 12:08:38 CEST

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