Merging branch into trunk deletes a file in trunk

I'd a trunk for on-going development work & branch for production bug
fixing. After I release the branch into production, I tried to merge it back
to the trunk (there're on-going work in the trunk). I found that a newly
created file in the trunk was deleted.

What could I be doing wrong? I followed the instructions in the Help file.

My steps are:

1. Check out a WC of my trunk (HEAD revision).
2. Right-click on WC folder, TortoiseSVN > Merge
3. From URL: trunk URL (HEAD revision), To URL: branch URL (HEAD revision)
4. Merge

I tried the other way:

1. Check out a WC of my trunk (HEAD revision).
2. Right-click on WC folder, TortoiseSVN > Merge
3. From URL: branch URL (HEAD revision), To URL: trunk URL (HEAD revision)
4. Merge

It still didn't work out. No files were merged, and only the new file in
trunk was added.
Received on Thu Mar 22 04:03:47 2007