Re: SVN Merge Tracking Issues

2011-11-01 Thread Neil Bird
Around about 31/10/11 16:21, michael.ru...@t-systems.com typed ... 2. Open the browser window "URL to merge from: -> ..." You need to enter a URL, otherwise the "..." will not open any window. If you enter the old ^/trunk it switches back to the current root, as the window opens with "HEAD" rev

Re: SVN Merge Tracking Issues

2011-10-31 Thread Stefan Sperling
On Mon, Oct 31, 2011 at 05:21:12PM +0100, michael.ru...@t-systems.com wrote: > >Does this match the situation you were facing? > This seems to be exactly the issue we are facing. Great! So it should "just work" if the tool is driven in the right way. > The developers are > using TortoiseSVN and n

RE: SVN Merge Tracking Issues

2011-10-31 Thread Michael.Rumpf
Hi Stefan, thanks for the quick reply. >Please never, ever, modify mergeinfo manually. ... >Then load this dump file into a new repository and use that repository >instead of the old one. We have created a backup (Hotcopy) of the repository before we did the property changes so we might get bac

Re: SVN Merge Tracking Issues

2011-10-31 Thread Stefan Sperling
On Mon, Oct 31, 2011 at 02:38:54PM +0100, Stefan Sperling wrote: > $ svn merge ^/master > --- Recording mergeinfo for merge of r4 into '.': >U . > --- Merging r5 through r6 into '.': > Ualpha I forgot to edit this output, sorry. To match up with other co

Re: SVN Merge Tracking Issues

2011-10-31 Thread Stefan Sperling
On Mon, Oct 31, 2011 at 09:59:32AM +0100, michael.ru...@t-systems.com wrote: > Hi, > > we have migrated a SVN repository that heavily relies on the relatively new > merge tracking feature. By doing that we have been struggeling with two major > issues: > > 1. Svn move does not fix svn:mergeinfo

SVN Merge Tracking Issues

2011-10-31 Thread Michael.Rumpf
Hi, we have migrated a SVN repository that heavily relies on the relatively new merge tracking feature. By doing that we have been struggeling with two major issues: 1. Svn move does not fix svn:mergeinfo property values 2. Svn merge operation does not realize that the code has been moved to a