Critical Description
Apologies if this has already been reported, but it's a difficult one to search for. The basic issue: User #1 merges from A -> B and commits. User #2 merges SOMETHING ELSE from A->B but doesn't update first to get User #1's changes. User #2 commits, and SVN allows the commit. After reviewing the resulting mergeinfo, User #1's mergeinfo is overwritten, and the merge info from User #1 is lost. I've reproduced this several times with TortoiseSVN 1.8.5. Note, we're using 2.5.16 version of VisualSVN server. My opinion is SVN should reject User #2's commit, and inform them they have an out-of-date working copy and it should force them to update before committing their merge changes. Exact steps to reproduce this issue can be seen here: http://mail-archives.apache.org/mod_mbox/subversion- users/201403.mbox/%3C04c0688f7a444f508ee73e82c808054f%40BLUPR05MB215.namprd05.pr od.outlook.com%3E Confirmation of the issue from a member of the users group is here: http://mail-archives.apache.org/mod_mbox/subversion- users/201403.mbox/%3C532291BF.5030707%40wandisco.com%3E Please note: This issue DOES NOT OCCUR if you're using a local repo (via file://)
Original issue reported by jebber007