1.1 --- a/schema2beans/test/build.xml	Fri Dec 06 07:21:51 2002 +0000
     1.2 +++ b/schema2beans/test/build.xml	Fri Dec 06 21:26:44 2002 +0000
     1.3 @@ -90,6 +90,8 @@
     1.4          <echo message="Default config is testtype: ${xtest.testtype}, attributes: ${xtest.attribs}."/>
     1.5      </target>
     1.6      
     1.7 -   
     1.8 +  <target name="build">
     1.9 +    <ant dir=".." antfile="build.xml" />
    1.10 +  </target>
    1.11  </project>
    1.12  

     2.1 --- a/schema2beans/test/unit/src/data/TestMerge.java	Fri Dec 06 07:21:51 2002 +0000
     2.2 +++ b/schema2beans/test/unit/src/data/TestMerge.java	Fri Dec 06 21:26:44 2002 +0000
     2.3 @@ -302,7 +302,13 @@
     2.4  	b2.addAuthor(s1);
     2.5  	check(b2.getAuthor(2).equals(s1), "added");
     2.6  	out("should get one event for elt added from merge");
     2.7 +    //out("Here is b1:");
     2.8 +    //b1.writeNoReindent(System.out);
     2.9 +    //out("Here is b2:");
    2.10 +    //b2.writeNoReindent(System.out);
    2.11  	b1.merge(b2);
    2.12 +    //out("Here is b1:");
    2.13 +    //b1.writeNoReindent(System.out);
    2.14  	check(b1.getAuthor(0).equals(b2.getAuthor(0)), "match");
    2.15  	check(b1.getAuthor(1).equals(b2.getAuthor(1)), "match");
    2.16  	check(b1.getAuthor(2).equals(b2.getAuthor(2)), "match");

     3.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass	Fri Dec 06 07:21:51 2002 +0000
     3.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass	Fri Dec 06 21:26:44 2002 +0000
     3.3 @@ -254,7 +254,6 @@
     3.4  out: TestMerge - creating the bean graph for the comment merge test
     3.5  out: <?xml version="1.0" encoding="UTF-8"?>
     3.6  out: <book good="no">
     3.7 -out:   <!-- BLUE -->
     3.8  out:   <author>
     3.9  out: 	John Smith
    3.10  out: 	</author>
    3.11 @@ -265,6 +264,8 @@
    3.12  out:     <word>
    3.13  out: 			Good book
    3.14  out: 		</word>
    3.15 +out:     <!-- MAUVE -->
    3.16 +out:     <!-- CYAN -->
    3.17  out:     <ref>
    3.18  out:       <page>
    3.19  out: 			22
    3.20 @@ -284,7 +285,6 @@
    3.21  out:   </chapter>
    3.22  out:   <good/>
    3.23  out:   <index>
    3.24 -out:     <!--RED-->
    3.25  out:     <ref>
    3.26  out:       <page>
    3.27  out: 			5
    3.28 @@ -293,6 +293,7 @@
    3.29  out: 			15
    3.30  out: 		</line>
    3.31  out:     </ref>
    3.32 +out:     <!--RED-->
    3.33  out:     <word>
    3.34  out: 			E-Tool
    3.35  out: 		</word>
    3.36 @@ -323,6 +324,7 @@
    3.37  out: 			story began.
    3.38  out: 		</paragraph>
    3.39  out:   </chapter>
    3.40 +out:   <!-- BLUE -->
    3.41  out:   <summary lang="us" length="123" size="12">
    3.42  out: 	This book is about the life of a book spent between books who dreamed
    3.43  out: 	to meet a fairy who could transform it into an XML book and travel

     4.1 --- a/schema2beans/test/unit/src/data/tm01_g4.xml	Fri Dec 06 07:21:51 2002 +0000
     4.2 +++ b/schema2beans/test/unit/src/data/tm01_g4.xml	Fri Dec 06 21:26:44 2002 +0000
     4.3 @@ -43,6 +43,8 @@
     4.4  		<word>
     4.5  			Good book
     4.6  		</word>
     4.7 +    	<!-- MAUVE -->
     4.8 +	    <!-- CYAN -->
     4.9  		<ref>
    4.10  		<page>
    4.11  			22