SVN Merge ignores newly added files from trunk to branch

Hi,
I have an issue while I am trying to merge trunk to one of the branches
created out of trunk.

This is the sequence I have followed:
1. Merged a release branch (january_branch) to trunk after production
release.
2. There were no conflicts and the merge was smooth (now trunk had all the
changes from the january branch (all new & modified files)
3. Now I am trying to get the updates (of january release) to one the
existing branches (july release branch). So I did a merge from trunk to
july_branch (which was a branch created long back from trunk for the july
release).

After this merge (resolving conflicts) there are a lot of new files missing
in one of the module's 'test' directory. Lot of test files were added in
this directory as part of january release (in january_branch).
But those new files exist in the trunk, I am not able to merge them to the
july_branch.

Any reasons why this is happening and how can I get those new files merged
onto july_branch?
Please advice.

SVN client: Subversion client 1.7
SVN server: SVN 1.7
Environment: Windows 7

Let me know if you need any more details.

thanks,
Arivarasan
Received on 2013-03-11 07:49:37 CET