D:\SVN\ruby-mergeinfo-test-reproduction>svn --version svn, version 1.4.2 (r22196) compiled Nov 3 2006, 16:53:07 Copyright (C) 2000-2006 CollabNet. Subversion is open source software, see http://subversion.tigris.org/ This product includes software developed by CollabNet (http://www.Collab.Net/). The following repository access (RA) modules are available: * ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol. - handles 'http' scheme - handles 'https' scheme * ra_svn : Module for accessing a repository using the svn network protocol. - handles 'svn' scheme * ra_local : Module for accessing a repository on local disk. - handles 'file' scheme D:\SVN\ruby-mergeinfo-test-reproduction>svnadmin create repo D:\SVN\ruby-mergeinfo-test-reproduction>md wc D:\SVN\ruby-mergeinfo-test-reproduction>set REPOS=file:///D:\SVN\ruby-mergeinfo-test-reproduction\repo D:\SVN\ruby-mergeinfo-test-reproduction>set REPOS=file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo D:\SVN\ruby-mergeinfo-test-reproduction>svn co file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo wc Checked out revision 0. D:\SVN\ruby-mergeinfo-test-reproduction>md wc\trunk D:\SVN\ruby-mergeinfo-test-reproduction>md wc\branch D:\SVN\ruby-mergeinfo-test-reproduction>echo sample 1>>wc\trunk\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>echo sample 1>>wc\branch\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>svn add wc\trunk wc\branch A wc\trunk A wc\trunk\sample.txt A wc\branch A wc\branch\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>svn ci wc -m"1" Adding wc\branch Adding wc\branch\sample.txt Adding wc\trunk Adding wc\trunk\sample.txt Transmitting file data .. Committed revision 1. D:\SVN\ruby-mergeinfo-test-reproduction>echo sample 1>>wc\branch\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>svn ci wc -m"2" Sending wc\branch\sample.txt Transmitting file data . Committed revision 2. D:\SVN\ruby-mergeinfo-test-reproduction>svn merge file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/branch@1 file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/branch@2 wc\trunk U wc\trunk\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>svn ci wc -m"3" Sending wc\trunk\sample.txt Transmitting file data . Committed revision 3. D:\SVN\ruby-mergeinfo-test-reproduction>svn cat file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/trunk/sample.txt sample sample D:\SVN\ruby-mergeinfo-test-reproduction>svn rm wc/branch/sample.txt D wc\branch\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>svn ci wc -m"4" Deleting wc\branch\sample.txt Committed revision 4. D:\SVN\ruby-mergeinfo-test-reproduction>svn merge file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/branch@3 file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/branch@4 wc\trunk D wc\trunk\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>svn revert wc\trunk\sample.txt Reverted 'wc\trunk\sample.txt' D:\SVN\ruby-mergeinfo-test-reproduction>echo sample 1>>wc\trunk\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>svn merge file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/branch@3 file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/branch@4 wc\trunk Skipped 'wc\trunk\sample.txt' D:\SVN\ruby-mergeinfo-test-reproduction>svn ci wc -m"5" Sending wc\trunk\sample.txt Transmitting file data . Committed revision 5. D:\SVN\ruby-mergeinfo-test-reproduction>echo sample 1>>wc\trunk\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>svn merge --force --dry-run file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/branch@3 file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/branch@4 wc\trunk D wc\trunk\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>svn merge --force file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/branch@3 file:///D:/SVN/ruby-mergeinfo-test-reproduction/repo/branch@4 wc\trunk D wc\trunk\sample.txt D:\SVN\ruby-mergeinfo-test-reproduction>svn ci wc -m"6" Deleting wc\trunk\sample.txt Committed revision 6.