Index: oldFileInTrunk.txt
===================================================================
--- oldFileInTrunk.txt	(.../trunk)	(revision 16)
+++ oldFileInTrunk.txt	(.../branches/1)	(revision 16)
@@ -1 +1 @@
-This file existed in trunk prior to branch b1  has been modified in trunk
+This file existed in trunk prior to branch b1  has been modified in b1
Index: src/au/com/forward/codeSections/testFiles/testin.cs
===================================================================
--- src/au/com/forward/codeSections/testFiles/testin.cs	(.../trunk)	(revision 0)
+++ src/au/com/forward/codeSections/testFiles/testin.cs	(.../branches/1)	(revision 16)
@@ -0,0 +1,76 @@
+This is a test file
+
+These top lines can never appear in the output 
+as they are not in any code section
+
+To run CodeSections commandLine version add CodeSections.jar to your class path and type
+
+java -jar CodeSections.jar
+
+for some brief help.
+
+try the following command lines
+
+To output only the default sections
+  java -jar CodeSections.jar testin.cs out1.txt
+
+To output the default sections and the option_1 sections
+  java -jar CodeSections.jar testin.cs out2.txt option_1
+
+To output the default sections and the option_1 and some_other_section sections
+  java -jar CodeSections.jar testin.cs out3.txt option_1 some_other_section
+
+This command line will produce a warning to System.out that no option code sections
+were found
+  java -jar CodeSections.jar testin.cs out4.txt option some_other_section
+
+To use the ant version add a task definition 
+	<taskdef name="codeSections"
+        classname="au.com.forward.codeSections.CodeSections"
+        classpath="${jars}/CodeSectionsAnt.jar"/>
+				
+and then call using  (eg. to produce the ant version)
+
+    <codeSections file="${src}/CodeSections.cs" toFile="${src}/CodeSections.java" ids="ant"/>
+
+The test file output is produced with		
+    <codeSections file="${dist}/testin.cs" toFile="${dist}/out1.txt"/>
+    <codeSections file="${dist}/testin.cs" toFile="${dist}/out2.txt" ids="option_1"/>
+    <codeSections file="${dist}/testin.cs" toFile="${dist}/out3.txt" ids="option_1, some_other_section"/>
+    <codeSections file="${dist}/testin.cs" toFile="${dist}/out4.txt" ids="option,some_other_section"/>
+
+		
+	---------------------
+	
+OK lets start a default code section that will always be output.
+
+<<*>>=  	
+ this is a default code section
+ this section will always be output
+<<option_1>>=
+ This is an option_1 code section it will be output if the 
+command line contains the option_1 id   eg.
+
+java -jar CodeSections.jar testin.txt out.txt option_1
+
+<<*>>=
+  This is another default section that is always output
+<<some_other_section>>=
+  This is a some_other_section section
+<<option_1>>=
+  back to an option_1 section
+<<*>>=
+  back to the default section
+the next line is not a code section id
+ <<option_1>>=
+as the code section id did not start in column 1
+<< option_1 >>= 
+is not a code section id either as there are spaces inside the << >>
+
+<<*>>=
+the next named section has alternate names.
+it belongs to both some_other_section  and to option_1
+
+<<some_other_section>>= <<option_1>>=
+ this section is common to both some_other_section and option_1
+ 
Index: newInBranch.txt
===================================================================
--- newInBranch.txt	(.../trunk)	(revision 0)
+++ newInBranch.txt	(.../branches/1)	(revision 16)
@@ -0,0 +1 @@
+This file is new in the branch 1

Property changes on: newInBranch.txt
___________________________________________________________________
Name: svn:mime-type
   + text/html

Index: newInTrunk.txt
===================================================================
--- newInTrunk.txt	(.../trunk)	(revision 16)
+++ newInTrunk.txt	(.../branches/1)	(revision 16)
@@ -1 +0,0 @@
-This file is new in Trunk