The scenario is the following:
- trunk is branched to A
- trunk is added directly folder1 with files file1 and file2
- A reintegrates trunk
The result is that when committing the merged working directory into A, its status is that:
folder1 added folder1/file1 not to be seen, marked as up to date with repository folder1/file2 not to be seen, marked as up to date with repository
So the commit ends up adding folder1 to the branch, but it doesn't add the files. So they remain in the working directory as under version control, but they're not...
My workaround is, after this commit:
- move out this "added" folders
- commit the delete
- move back the folders
As this doesn't quite often it's doable, but it is far from a decent solution, so I think I'm definitely missing something...
I've tried all sorts of cleanup and nothing marks those new files as "added" (to be committed)...