Should the clauses be separated by a comma?
 
When the summer comes we will go hiking.