The correct way to recursively merge two branches using Subversion:
svn merge target_dir@revision source_dir@revision working_dir
Notice:
- working_dir is most likely the target_dir
- target_dir comes before source_dir
Use this example when you’re in the working directory you’re trying to merge into:
svn merge .@head source_dir@head .
After merging, you’ll want to check that the merge succeeded:
diff -u –recursive source_dir target_dir
