@@ -639,7 +639,7 @@ Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
639
639
<arg value =" ${ build.test.reposroots } /svn" />
640
640
</exec >
641
641
642
- <!-- need absolute path for svn url -->
642
+ <!-- need absolute path for svn url -->
643
643
<pathconvert property =" test.svn.url" >
644
644
<map from =" " to =" file://" />
645
645
<path location =" ${ build.test.reposroots } /svn" />
@@ -652,6 +652,41 @@ Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
652
652
<arg value =" -m" />
653
653
<arg value =" Initial import" />
654
654
</exec >
655
+
656
+ <!-- Unit test for issue #694 -->
657
+ <exec executable =" svn" failifexecutionfails =" false" >
658
+ <arg value =" checkout" />
659
+ <arg value =" ${ test.svn.url } " />
660
+ <arg value =" ${ build.test.reposroots } /svn-working" />
661
+ </exec >
662
+ <mkdir dir =" ${ build.test.reposroots } /svn-working/parent" />
663
+ <mkdir dir =" ${ build.test.reposroots } /svn-working/parent/module1" />
664
+ <mkdir dir =" ${ build.test.reposroots } /svn-working/parent/module2" />
665
+ <touch file =" ${ build.test.reposroots } /svn-working/parent/module1/file1.txt" />
666
+ <touch file =" ${ build.test.reposroots } /svn-working/parent/module1/file2.txt" />
667
+ <exec executable =" svn" failifexecutionfails =" false" dir =" ${ build.test.reposroots } /svn-working" >
668
+ <arg value =" add" />
669
+ <arg value =" parent" />
670
+ </exec >
671
+ <exec executable =" svn" failifexecutionfails =" false" dir =" ${ build.test.reposroots } /svn-working" >
672
+ <arg value =" commit" />
673
+ <arg value =" -m" />
674
+ <arg value =" files in 2 modules" />
675
+ </exec >
676
+ <!-- move the file1 from module1 to module2, and commit to finish our test case -->
677
+ <exec executable =" svn" failifexecutionfails =" false" dir =" ${ build.test.reposroots } /svn-working" >
678
+ <arg value =" move" />
679
+ <arg value =" parent/module1/file1.txt" />
680
+ <arg value =" parent/module2" />
681
+ </exec >
682
+ <exec executable =" svn" failifexecutionfails =" false" dir =" ${ build.test.reposroots } /svn-working" >
683
+ <arg value =" commit" />
684
+ <arg value =" -m" />
685
+ <arg value =" move file1.txt from module1 to module2" />
686
+ </exec >
687
+ <delete dir =" ${ build.test.reposroots } /svn-working" />
688
+ <!-- end of unit test for issue #694 -->
689
+
655
690
<exec executable =" svn" failifexecutionfails =" false" >
656
691
<arg value =" checkout" />
657
692
<arg value =" ${ test.svn.url } " />
0 commit comments