Aug 12, 20085
Subversion merging problems - working copy on Samba share
Subversion has been giving me a few headaches lately - it seems to coincide with upgrading both repository and clients to 1.5, but i've not tried downgrading so can't be sure. The latest problem is occurring when trying to merge some trunk bug fixes (from a single changeset, the latest revision in the trunk) into a feature branch we're working on.