Re: svn merge bug

2009/7/10 chengj929 <chengj929_at_163.com>:
> HELLO,ALL:
>
> Recently, I find a bug of TortoiseSVN.exe(1.6.3)."commit failed !",
> I also do the same operations
> with CollabNetSubversion-client-1.6.3-3.win32.exe ,there is no error!
>
> MY svn message are:
>
> 1:http://17*.*.*.*/svn/test_svn_1@6964,has 5files
> └─test_svn_1
> B.png
> c.png
> d.png
> e.png
> f.png
>
> 2:http://172.*.*.*/svn/test_svn_1@6967,has 3files
> └─test_svn_1
> a.png
> b.png
> f.png
>
> 3:http://172.*.*.*/svn/test_svn_2 :HEAD was copy from
> http://17*.*.*.*/svn/test_svn_1@6964
> └─test_svn_2
> B.png
> c.png
> d.png
> e.png
> f.png
>
> here I just want to merge http://172.*.*.*/svn/test_svn_1 from 6964 to 6967
> into the workcopy of http://172.*.*.*/svn/test_svn_2.
>
> steps :
> in (http://17*.*.*.*/svn/test_svn_2)'s workcopy:
> 1):use TortoiseSVN.exe(1.6.3)to merge:
> URL to merge from is:http://17*.*.*.*/svn/test_svn_1
> Revision range to merge is :6964-6967
> 2):use TortoiseSVN.exe(1.6.3)to commit.
> result:fail.
> report errors as:
> Commit
> I:\test\temp1\test_svn_2
> I:\test\temp1\test_svn_2\B.png
> I:\test\temp1\test_svn_2\a.png
> I:\test\temp1\test_svn_2\b.png
> I:\test\temp1\test_svn_2\c.png
> I:\test\temp1\test_svn_2\d.png
> I:\test\temp1\test_svn_2\e.png
> Commit succeeded, but other errors follow:
> Error bumping revisions post-commit (details follow):
> In directory 'I:\test\temp1\test_svn_2'
> Error processing command 'committed' in 'I:\test\temp1\test_svn_2'
> Error getting 'affected time' for 'I:\test\temp1\test_svn_2\.svn\text-base\b.png.svn-base'
> Can't stat 'I:\test\temp1\test_svn_2\.svn\text-base\b.png.svn-base':
> 系统找不到指定的文件。
>
> I known the error is caused by the files:B.png,b.png,but the two files not
> at the one direcory the same time.so,I think it is a bug ,not a wrong
> operation!

This is a duplicate of a message you sent to the users list. Please
read the list for replies.

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