Re: inconsistency between mergeinfo records

2015-02-24 Thread Stefan Hett
Hi Bert, thanks. That mostly does explain the current behavior to me. From a user's point of view I however find this difference in recorded mergeinfos quite problematic. While certainly both cases represent the same logical merge structure: case 1: svn:mergeinfo for /B: /A:2-5 case 2:

Re: inconsistency between mergeinfo records

2015-02-23 Thread Bert Huijben
I haven’t looked at the full details, but actual merges only store mergeinfo of what is actually merged (includes unaffected tree filtering, filtering what is already merged, etc.). A record only merge is a tool to just register as merged the affected target without further processing. It is pri

Re: inconsistency between mergeinfo records

2015-02-22 Thread Stefan Hett
Another user (Sergey Azarkevich) actually pointed me to an interesting fact: C:\test\test2checkout>svn merge file:///C:/test/test2/A B --record-only --- Recording mergeinfo for merge of r2 through r5 into 'B': ... C:\test\test2checkout>svn merge file:///C:/test/test2/A B --- Merging r3 through r5

Re: inconsistency between mergeinfo records

2015-02-22 Thread Stefan Hett
Looks like the batch-file got truncated by some clients/mail servers on the way --- here's the plain batch file content. Anyone having an idea what's going on here? REM create test repository mkdir C:\test cd /d C:\test mkdir test2 svnadmin create test2 REM check-out test repository mkdir test2