Hi,
We are following the re-book description for long lived branches. So we have a
trunk and a feature branch.
We regularly keep the feature branch upto date with trunk updates by doing svn
merges.
We then re-integrate the feature branch back to the trunk. We then follow up
with a record only merge to the
feature branch. This has all been working well. The mergeinfo on the branches
tracks the merged info etc.
Today we have uncovered a problem that we cannot get to the bottom of. We are
doing a merge from the trunk
to a feature branch. We dont expect anything unusual as weve been doing this
regualr enough.
What is happening is that the svn merge command appears to operate correctly.
For a specific folder we see files being marked for deletion and some file
being updated.
However after the merge command is completed we find that the files that were
marked for deletion are NOT deleted.
The files updated are locally modified (M). We have repeated the operation several times with clean working copies to no
avail.
There are no conflicts in the folder in question.
We are using 1.6.12 on RHL.
We have also tried 1.7.7. When we tried this we got a segmentation fault during
the merge command.
(but thats a different issue).
Has anyone seen this i.e. svn merge saying a file will be deleted , but the
file is not deleted?
Thx
Derek
