How to merge the changes in a trunk to a branch?

[Beherith]

I have the BA and BAR repositories on a singular host, under the same SVN.

http://imolarpg.dyndns.org/trac/balatest/browser

BA is under /svn/trunk, while BAR is under /svn/branches/BAR.

Most of the fixes, updates and others only get committed to the trunk, especially the widget and gadget fixes, While models and scripts that get updated in BAR are only committed to the BAR branch.
My issue is the following:
How can I merge the lua and other fixes from the BA trunk into the BAR branch with svn?

I tried using SVN merge, but it just didnt merge over anything that changed in the LuaUI and LuaRules folders in the BA trunk.

[Silentwings]

I had assumed (without thinking) at some point in the future you would take the latest BA and overwrite all the models/textures/anims/etc with BAR ones. And then there would be some fun removing the BA interface and putting the BAR interface in. And then probably a tonne of small things to clean up - yardmap sizes, unit names, etc.

If there is a way to merge automatically then fantastic (& I don't know how to do it, sorry). But if not, I'm guessing since it's a big job you'll only want to merge once and then after that anything common to both branches will have to be fixed/changed for both at once?

[Beherith]

SVNMerge should have worked, as it theoretically does what I want it to, except that it does. This is a really easy thing and should not be nearly as difficult as manually committing all the changesl...

[very_bad_soldier]

For me it looks like the BAR branch was not correctly set up as a branch using the svn branch/cp commands. SVN tracks the point where the branch was based off when using them.
Usually you see in the log of the branch the information "Copy From Path" and "Revision". Look at the chili branch. The first commit says "Copy from path" "/trunk" and "Revision" 202.

Also Tortoise is able to show the revision graph correctly based on the "Copy From"-information. The BAR branch looks like it was manually added just like any other normal new file.

Currently trying to reintegrate BAR into trunk is refused by SVN with the "Error: must be ancestrally" related which also indicates that SVN is not able to understand the relation between BAR and trunk (due to the missing copy-from information I guess).

Well, sadly I have no idea what is the best way to solve this. Remember that manual merging will "break" SVN merge tracking feature.

EDIT:
Maybe its possible to manually add those "copy-from"-information (might be stored as a normal SVN property). But i dont know if its feasible to add that thing manually.

[very_bad_soldier]

Another thing which might be a problem:
Some directories do differ in upper and lower case naming between BAR and trunk. For example "LuaRules", "LuaUI", "Anims" and "Bitmaps".