Merge bug -- svn:keywords and conflict resolution

2012-05-31 Thread Neil.Tuffs
I would like to confirm this issue in v 1.6.17 - using binary files via TortoiseSVN. Test scenario was to create a binary file in trunk with the "svn:keywords = Revision" property set*; branch the trunk to $BAU; change the file in $BAU (and commit); merge the change revision from $BAU back into

Subversion Issue: 'delete file' not transmitted to server when performing multiple merge-commit

2011-01-13 Thread Neil.Tuffs
Dear Users, My user reported that an extra file existed in the repository after performing a merge (claiming this file was not in his working copy prior to the commit). My initial thought was they had done the merges out of sequence causing the deletion of a file before it was added, the user was