Branching subversion howto. Creating the branch Merge with the trunk Back to the trunk Delete your branch
I suppose here your server is based on svn over ssh (svn+ssh), you can easily replace svn+ssh by https if you use Webdav for example.
Creating the branch
Choose a branche name for example, MyBranch. Create the branch in the repository by copying the trunk:
Remember this commited revision number 3328.
If you have a local copy you do not need to checkout your branch just switch:
Do not forget the dot at endline.
If you do not have a local copy you, checkout your branch:
Check if the localization is ok:
Now you can work with your branch exactly as working on the trunk. (update, commit, etc …).
Merge with the trunk
You’ve been developing on your branch, and so have other people on trunk, and now you have to add their changes to your branch.
Add their changes to your branch:
This command finds all the changes in revisions 3329, 3330, … , 3269 that were made in the trunk, and applies them in Mybranch.
Now you must commit these changes to your branch repository; with appropriate comments to remember which range you have already merged:
After another interval of work, you will have to merge again to get the new changes. You specify a revision range that takes only the changes you haven’t already merged:
Add their changes to your branch:
This command finds all the changes in revisions 3370, 3371, … , 3333 that were made in the trunk, and applies them in Mybranch.
Now you must commit these changes to your branch repository:
Back to the trunk
Once you have finished your branch and you have merged again the last change from the trunk, you will commit your branch back to the trunk. Remember! MyBranch was created at revision number 3328. Now you have to add all your changes to the trunk.
Switch to the trunk and merge from Mybranch all the changes(3328:3400) to the trunk
Check if the relocalization is ok:
Add all your changes to the trunk
Now you must commit these changes to the trunk:
Delete your branch
At last, delete your branch
If you found this post or this website helpful and would like to support our work, please consider making a donation. Thank you!Help Us
Articles in the same category
- Linux - Tip of the day
- Time a task: time
- SVN -- How to ignore file or directory in subversion?
- SVN -- Branch, Branching subversion howto
- Speedup GNU make build and compilation process
- phpMyAdmin: Search and Replace in MySQL database
- Linux How to delete or remove printer from command line
- Linux How to connect to Windows with remote desktop RDP in CentOS 7 / RedHat 7
- Intel compilation for MIC architecture KNL Knights Landing
- How to setup SSH timeout in shell script ?
- How to make a denial of a service with fork functions in BASH ?
- How to encrypt/decrypt a file or directory in Linux?
- How to diff remote files using ssh ?
- How to Convert Text File From ISO-8859-15 to UTF-8 Encoding
- How to change the MAC address on Linux
- Got permission denied while trying to connect to the Docker daemon socket
- GNU compilation for MIC architecture KNL Knights Landing
- Generating a self-signed certificate using OpenSSL with Linux CentOs/RedHat for Apache/httpd
- Find out biggest cpu/memory consuming processes with ps command
- Find list of options that python was compiled with
- Download music and videos .mp3, .wma, .avi, .mpg , divx with google
- Crontab : Scheduling Tasks
- Comment changer son adresse MAC sous Linux
- Check/find version of numpy i'm using
- Archiving and compressing data files tar