Flashmark

Avatar

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.

Public key authentication when tunnelling Subversion repository access over SSH

It is relatively straightforward to allow access to the repository by tunnelling the Subversion protocol over ssh. The use of public key authentication is necessary in this scenario, and also makes life easier when implemented correctly. It is possible to use a single system account for multiple Subversion users, none of which have to be given command prompt access. The public/private key pair generated here will be used exclusively ...

,