I have a drupal project that I have been working on and storing in an SVN repository. The project was initially based on Drupal 5 but I have had to upgrade to Drupal 6. I'm new to branching/merging/tagging in SVN so I need some help.
I had trunk, and I created a new branch called Drupal 5, just to keep it for history sake. I then also created a Drupal 6 branch, where I upgraded Drupal and all my contrib modules and themes and custom code to D6.
Now trunk is all my old D5 code, as is the D5 branch. Should I be pulling my D6 code back in to trunk? How do I do this? I am using Eclipse on Windows but can access it via a unix shell if that is going to be easier.