Svn Merging Dev/Prod with TortoiseSVN

    For some of my professional projects I don't get to choose the environment and when that happens I'm forced to learn or re-learn in this case certain tools/technologies. I can't take complete credit for this article as it was mostly written by a previous co-worker however nothing here is secretive and it shouldn't be; since none of it is proprietary

Merging from Trunk to Branch  
After making any change in trunk, immediately merge those changes to the branch, Make sure your working copy of your branch has no un-commited changes. Open command prompt and change into tortise bin folder.
  1. Usually: c:\Program Files\TortoiseSVN\bin\ 
  2. Update your branch working copy with the following command:
  3. TortoiseProc.exe /command:update /path:C:\Development\YOURPROJECT
  4. Replace the path parameter with the actual path to your branch working copy
  5. Run the following command:
  6. TortoiseProc.exe /command:merge /fromurl:https://subversion.com/YOURPROJECT
  7. The following screen will appear. Leave the defaults selected as shown, and click next.
  8. On the next screen, leave the defaults and click Test Merge.
  9. Ensure the results look as expected.
  10. Click merge
  11. COMMIT THE MERGE using the following command:
  12. TortoiseProc.exe /command:commit /path:C:\Development\YOURPROJECT
  13. If you want to be sure it was successful, repeat steps 1-4. The “Test merge” should show nothing to do.
Merging from Branch to Trunk
First you must follow the steps above to update the branch from the trunk!
  1. Even if there is nothing new in trunk, this must be done so subversion will record the revisions to be able to do the reintegration successfully
  2. Make sure your working copy of your trunk has no un-commited changes
  3. Update your trunk working copy with the following command:
    TortoiseProc.exe /command:update /path:C:\Development\YOURPROJECT
    Replace the path parameter with the actual path to your trunk working copy
  4. Open command prompt and run the following command:
    TortoiseProc.exe /command:merge /fromurl:https://subversion.com/YOURPROJECT /path:C:\Development\YOURPROJECT
  5. The following screen will appear. Leave the defaults selected as shown, and click next.


  6. On the next screen, leave the defaults and click Test Merge
  7. Ensure the results look as expected.
  8. Click merge
  9. COMMIT THE MERGE using the following command:
    TortoiseProc.exe /command:commit /path:C:\Development\YOURPROJECT
  10. If you want to be sure it was successful, repeat steps 1-4. The “Test merge” should show nothing to do.

Popular posts from this blog

Nginx Best Practices Extended

Installing Windows on Acer chromebook 15 cb3-532

Entity Framework: ToListAynsc & WhereAsync