Notice: All operations in trunk and branch are done on the files and folders on disk. No SVN "Switch" is used.
My steps to reproduce (just tested again): 1) Create new repo with default folder structure using TSVN (-> rev.1) 2) Checkout full repo into a folder. 3) Create doc1.txt in trunk, enter some lines, commit (-> rev.2) 4) Create branches/b01 from trunk (-> rev. 3) 5) SVN Delete doc1.txt in the branch b01, commit (-> rev. 4) 6) SVN Delete doc1.txt in the trunk, do NOT commit, merge branch b01 (update upon request, continue merge) -> Tree conflict, Failure from above. Best regards Tobias Knauß [email protected] schrieb am Mittwoch, 17. Februar 2021 um 15:34:56 UTC+1: > onsdag 17 februari 2021 kl. 14:47:40 UTC+1 skrev Tobias Knauss: > >> Correction: >> I accidentally merged into the "working copy 1". So, this problem >> happened independently of my working prinziple. It can be reproduced by >> these steps: >> - delete a file in a branch >> - commit the branch >> - delete the file in the trunk >> - merge the branch. >> I could reproduce the issue in a test repo. >> > > I've tried to reproduce but I can't. I've created a new repo with a trunk, > added a file in trunk, copied to "branch", deleted in branch and committed. > > If I follow your steps exactly, ie deleting the file in trunk and mergeing > without committing, I get an error Cannot merge into a working copy that > has local modifications. > > If I first commit the delete in trunk and then merge, I get a tree > conflict. But I can select either to ignore or to accept the incoming > deletion. Both succeed and record the correct merge info. > > Can you create a new repository and detail all the steps? If this is an > actual error there might be a fail chance that it is also reproducible > using the svn command line client, in which case a reproduction should go > to [email protected]. > > Kind regards, > Daniel Sahlberg > > -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/45c0d3d1-bf19-4f98-b5ad-48676b1bcdd4n%40googlegroups.com.
