Both sides previous revision
Previous revision
Next revision
|
Previous revision
|
dev:branching [2012/09/23 16:58] tedfelix Add note about new URL |
dev:branching [2021/04/02 02:11] tedfelix |
======Working with branches====== | ======Working with branches====== |
| |
NOTE: The rosegarden svn URL on sourceforge has changed. This page has not been updated to reflect that. Hopefully it is simply a matter of replacing all | **//OBSOLETE//** |
| |
| These instructions have been superseded by [[dev:Using git]]. |
| |
| **//OBSOLETE//** |
| |
| NOTE: The rosegarden svn URL on sourceforge has changed. This page has only been partially updated to reflect that. Usually it is simply a matter of replacing all |
| |
| https://<user>@rosegarden.svn.sourceforge.net/svnroot/rosegarden |
| |
https://<user>@rosegarden.svn.sourceforge.net/svnroot/rosegarden/ | |
| |
with | with |
| |
svn://<user>@svn.code.sf.net/p/rosegarden/code | svn+ssh://<user>@svn.code.sf.net/p/rosegarden/code |
| |
Keep this in mind while reading this page... | Keep this in mind while reading this page... |
| |
| ===== When to branch? ===== |
To branch or not to branch? | To branch or not to branch? |
| |
Create a new branch by copying trunk/. For example, for a branch called <my_branch>, do the following (as a single one-line command): | Create a new branch by copying trunk/. For example, for a branch called <my_branch>, do the following (as a single one-line command): |
<code> | <code> |
svn copy https://<user>@rosegarden.svn.sourceforge.net/svnroot/rosegarden/trunk/rosegarden \ | svn copy svn+ssh://<user>@svn.code.sf.net/p/rosegarden/code/trunk/rosegarden \ |
https://<user>@rosegarden.svn.sourceforge.net/svnroot/rosegarden/branches/<my_branch> | svn+ssh://<user>@svn.code.sf.net/p/rosegarden/code/branches/<my_branch> |
</code> | </code> |
You can see what branches already exist (so as to get ideas for a new name, perhaps) using | You can see what branches already exist (so as to get ideas for a new name, perhaps) using |
<code> | <code> |
svn ls https://<user>@rosegarden.svn.sourceforge.net/svnroot/rosegarden/branches/ | svn ls http://svn.code.sf.net/p/rosegarden/code/branches/ |
</code> | </code> |
| |
(Or you can browse the the online Subversion repository at http://rosegarden.svn.sourceforge.net/viewvc/rosegarden/branches/) | (Or you can browse the online Subversion repository at http://sourceforge.net/p/rosegarden/code/) |
| |
//Note//: Replace <user> with your SourceForge username and <my_branch> with your branch name. | //Note//: Replace <user> with your SourceForge username and <my_branch> with your branch name. |
The full command to checkout my_branch using username is: | The full command to checkout my_branch using username is: |
<code> | <code> |
svn checkout https://<user>@rosegarden.svn.sourceforge.net/svnroot/rosegarden/branches/<my_branch> <my_branch> | svn checkout svn+ssh://<user>@svn.code.sf.net/p/rosegarden/code/branches/<my_branch> <my_branch> |
</code> | </code> |
//Note//: Replace <user> with your SourceForge username and <my_branch> with your branch name. | //Note//: Replace <user> with your SourceForge username and <my_branch> with your branch name. |