[BUG] TortoiseSVN 1.14.6(64-bit) Merge failed on 'waterfall' tags

[kang kai]

I have three tags, named 'exp' 'obn' and 'ob'. It's designed to test and publish changes from 'exp' to 'obn', finally to 'ob' (which works like waterfall).

Steps to meet my merge error:

1) make tag from 'exp' to 'obn'

2) make tag from 'obn' to 'ob'

3) make some change on 'exp', add one file called 11.txt for example

4) rename 'obn' to 'obn_backup' in repo-browser

5) make tag from 'exp' to 'obn', then there is 11.txt on 'obn'

6) try merge 11.txt from 'obn' to 'ob', then error occurs. only version-info is merged(uncheck 'Stop on copy' first), without the file 11.txt

hope to get solution for it, thanks

[Daniel Sahlberg]

Can you please copy the error message in step 6? I would assume it doesn't work since ob isn't related to obn anymore after step 4/5 so there is probably not a common ancestor.

 Instead I'd replace steps 4/5 with a plain merge from ex to obn. Then you should be able to merge from obn to ob in step 6.

Kind regards,

Daniel

[kang kai]

Thanks a lot for reply.

Actually, no error msg is shown, with only this log: 

-------------------------------------

Command                                                         Merging revisions 5-6 of file:///D:/testsvn/testSVNRepo/obn into D:\testsvn\ob, respecting ancestry

Recording mergeinfo for merge of r6          D:\testsvn\ob

Updated                                                            D:\testsvn\ob

                                                                           D:\testsvn\ob

Completed! 

-----------------------------------

I have tried to check/uncheck 'Ignore ancestry' on merge options, but it can't help.

When I do this merge via svn command line: 

        'svn merge -c 6 file:///D:/testsvn/testSVNRepo/obn', 

it works well, 11.txt can be merged to ob. 

So it seems like only a bug on tortoisesvn merge tools. Or is there any svn configs to fix this?