使用Tortoise SVN按公司流程迁移更新代码遇阻求助

Hey there! As someone who's walked through this exact kind of SVN workflow with new folks before, let's break down each step clearly using TortoiseSVN's graphical interface—no confusing command lines needed. I'll map directly to your company's process so you can follow along easily.

Step 1: Pull the dev/main branch to your local machine #

1. Right-click an empty folder on your computer (where you want to store the code) and select TortoiseSVN → Checkout.
2. In the "URL of repository" field, paste your company's branch path: svn/repo/(app name)/branches/dev/main.
3. Choose your local target folder (the one you right-clicked) in the "Checkout directory" field.
4. Click OK and wait for TortoiseSVN to download all the code to your machine.

Step 2: Make your local code changes #

This part is straightforward—edit the files you need to modify in your local dev/main folder. When you're done, you can double-check your changes by right-clicking the folder and selecting TortoiseSVN → Check for Modifications to see exactly which files you've edited.

Step 3: Create a new branch and submit your changes #

Before creating your branch, always make sure your local dev/main is up-to-date to avoid conflicts later:

1. Right-click your local dev/main folder, select TortoiseSVN → Update. Wait for it to sync any new changes from the server.
2. Next, right-click the folder again and choose TortoiseSVN → Branch/Tag.
3. In the pop-up window:
   • The "From URL" field should already be filled with the dev/main path—leave this as is.
   • In "To URL", enter your new branch path. Use a clear, descriptive name (e.g., svn/repo/(app name)/branches/feature/user-profile-fix or svn/repo/(app name)/branches/bugfix/login-error-456).
   • Write a detailed log message explaining what you changed (e.g., "Fixed password reset link not sending to users with special characters").
   • Check the Working copy option (this ensures your local edits are included in the new branch).
4. Click OK—this creates the new branch on the server and pushes your changes to it.
5. Optional but recommended: Right-click your local folder, select TortoiseSVN → Switch, paste your new branch's URL, and click OK. This switches your local working copy to the new branch so you can make additional edits if needed.

Step 4: Merge your branch back to dev/main after QA approval #

Once QA signs off, it's time to merge your changes into dev/main:

1. First, get the latest version of dev/main locally. Either:
   • Switch your existing working copy back to dev/main (use TortoiseSVN → Switch with the dev/main URL), then run Update.
   • Or, checkout a fresh copy of dev/main to a new folder (using the same Checkout steps from Step 1).
2. Right-click the dev/main folder and select TortoiseSVN → Merge.
3. In the merge wizard, choose Merge a range of revisions and click Next.
4. In "URL to merge from", paste your new branch's URL (e.g., svn/repo/(app name)/branches/feature/user-profile-fix).
5. Leave the revision range as "Latest from HEAD" (this merges all changes from your branch) and click Next.
6. Click Merge and wait for the process to finish.
7. If there are conflicts (TortoiseSVN will alert you), open the conflicting files—you'll see markers like <<<<<<<, =======, >>>>>>> separating your branch's changes from dev/main's. Edit the file to resolve the conflict, then right-click the file and select TortoiseSVN → Resolved.
8. Once all conflicts are fixed and you've tested the merged code, right-click dev/main and select SVN Commit. Write a log message like "Merged feature/user-profile-fix into dev/main (QA approved)" and submit.

Step 5: Merge dev/main changes to trunk #

Finally, push the approved changes to the trunk:

1. Get the latest trunk code locally—either update an existing trunk working copy or checkout a new one using the URL svn/repo/(app name)/trunk.
2. Right-click the trunk folder, select TortoiseSVN → Merge, and choose Merge a range of revisions again.
3. In "URL to merge from", paste the dev/main URL: svn/repo/(app name)/branches/dev/main.
4. Select "Latest from HEAD" to merge all recent changes from dev/main and click Next.
5. Click Merge, resolve any conflicts (same process as Step 4), and test the code.
6. Commit the merged changes to trunk with a log message like "Merged dev/main into trunk post-QA approval".

Quick Tips for New TortoiseSVN Users #

• Always run Update before making changes or merging—this keeps your local code in sync with the server and reduces conflicts.
• Use descriptive branch names and log messages—your team will thank you later when they need to track changes.
• If you get stuck on conflicts, don't hesitate to ask a teammate for help—resolving conflicts is a common pain point for new users!

内容的提问来源于stack exchange，提问作者goalie35