branch sync with unversioned files results in versioned file being deleted when reintegrated

Hey all,

I found this oddity today with a branch which had an unversioned file in a checkout, which I then synced up with a trunk which had a version of the file committed. "svn merge" reported the file skipped and a "svn status" afterwards didn't complain about conflicts. The merge was committed and then reintegrated into trunk, which promptly marked the file as being deleted.

Anyone else encounter this?
                                               
Received on 2011-08-01 06:14:40 CEST