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/4956e771-f1e7-4cdc-8698-3633e3bdd546n%40googlegroups.com.
