Re: Mergeinfo overwritten from successive merges

2014-03-13 Thread Jeb Wilson
e2.txt Committed revision 5. E:\Colspace\sandbox2>svn update user1_branch Updating 'user1_branch': Auser1_branch\file2.txt U user1_branch Updated to revision 5. E:\Colspace\sandbox2>svn propget svn:mergeinfo user1_branch /trunk:3 WHOOPS, WHAT HAPPENED TO THE MERGED REV 2?? I M

Mergeinfo overwritten from successive merges

2014-03-12 Thread Jeb Wilson
Hello all, Apologies if this has already been reported, but it's a difficult one to search for. This came through from TortoiseSVN 1.8.5. Here's the basic way to reproduce: 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