> I've never used svnmerge, so I don't know what the strategy for > automatic merging would be. Reading about svnmerge tells me that you probably should use "svnmerge merge -r <trunk-rev> -S trunk -M" on the 3k branch; this should record the revision from the branch as already (manually) merged. Regards, Martin