On Oct 21, 2:10 am, Stefan Sperling <s...@elego.de> wrote: > On Thu, Oct 20, 2011 at 02:02:48PM -0700, Douglas Wilson wrote: > > > On Oct 20, 10:45 am, Stefan Sperling <s...@elego.de> wrote: > > Does that make sense? Yes, I get that.
I was using Tortoise, but retested with command line SVN: C:\SVN\Test>svn merge -r 3:4 --dry-run file:///C:/SVN/TestRepo/trunk . --- Merging r4 into 'Dir1': U Dir1\file1.txt C:\SVN\Test>svn merge -r 3:4 file:///C:/SVN/TestRepo/trunk . --- Merging r4 into 'Dir1': U Dir1\file1.txt --- Recording mergeinfo for merge of r4 into '.': U . --- Recording mergeinfo for merge of r4 into 'Dir1': U Dir1 C:\SVN\Test>svn diff Index: . =================================================================== --- . (revision 4) +++ . (working copy) Property changes on: . ___________________________________________________________________ Added: svn:mergeinfo Merged /trunk:r4* Index: Dir1 =================================================================== --- Dir1 (revision 4) +++ Dir1 (working copy) Property changes on: Dir1 ___________________________________________________________________ Added: svn:mergeinfo Merged /trunk/Dir1:r4 Index: Dir1/file1.txt =================================================================== --- Dir1/file1.txt (revision 4) +++ Dir1/file1.txt (working copy) @@ -0,0 +1 @@ +New stuff C:\SVN\Test>svn log -r 4 -v file:///C:/SVN/TestRepo ------------------------------------------------------------------------ r4 | dwilson | 2011-10-20 15:07:07 -0700 (Thu, 20 Oct 2011) | 1 line Changed paths: M /trunk/Dir1/file1.txt Commit trunk changes ------------------------------------------------------------------------
