SVN updating Branch from Trunk and merging Branch back into Trunk

Here are 2 good and useful tips:

How to merge the updated files from Trunk into the Branch:

1. Go to the branch dir
2. Execute the following command:

svn merge –dry-run svn://urlToTheTrunkRepository (or http – according to your config)

If all ok, remove the –dry-run, execute the command and commit the changes.

Now the other way around, merging the changes from the branch into trunk:

1. Go the Trunk dir
2. Execute the following command:

svn merge –reintegrate –dry-run svn://urlToTheBranchRepository

If all ok, remove the –dry-run, execute again and commit the changes.

Advertisements

About mcloide

Making things simpler, just check: http://www.mcloide.com View all posts by mcloide

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

%d bloggers like this: