<div>
Great, thanks. Checked out trunk, deleted everything, committed. Exported D6 branch, imported it to trunk, committed again.
</div>


Great, thanks. Checked out trunk, deleted everything, committed. Exported D6 branch, imported it to trunk, committed again.

<div>
<div class="content wysiwyg-content">
Hi experts,<br />
<br />
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.<br />
<br />
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.<br />
<br />
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.<br />
<br />
Regards,<br />
Michael
</div>
</div>


Hi experts,

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.

Regards,
Michael

SVN - How to merge branches back to trunk

Web development includes all aspects of presenting content on intranets and the Internet, including delivery development, protocols, languages and standards, server software, browser clients, databases and multimedia generation.

Web Development

Web development software is used to create websites for both the Internet and intranets. Software can be either locally installed or operated through a cloud interface, and ranges in complexity from simple text editors to full-fledged integrated development environments (IDEs) that include graphics, video, audio, scripting and database support.