Procedure for sandbox branches in SVN?
I'd like to create a branch for maintaining the setuptools 0.6 line through its beta and final release, while new work proceeds on the trunk for integration with Python 2.5 and beginning the 0.7 line. Is there any special procedure I should follow, or can I just make a 'setuptools-0.6' branch under sandbox/branches?
[Phillip J. Eby]
I'd like to create a branch for maintaining the setuptools 0.6 line through its beta and final release, while new work proceeds on the trunk for integration with Python 2.5 and beginning the 0.7 line. Is there any special procedure I should follow, or can I just make a 'setuptools-0.6' branch under sandbox/branches?
Just do it. Branches under SVN are cheap, go fast, and are pretty easy to work with. Even better, because a branch is just another named directory in SVN's virtual file system, you can "svn remove" it when you're done with it (just like any other directory). BTW, if you're not already familiar with it, read about the `--stop-on-copy` option to SVN's `log` command.
Tim Peters wrote:
Just do it. Branches under SVN are cheap, go fast, and are pretty easy to work with. Even better, because a branch is just another named directory in SVN's virtual file system, you can "svn remove" it when you're done with it (just like any other directory).
That's all true. Of course, removing the branch won't free up any disk space - it will just remove the branch from the view (IOW, it is also easy to bring it back if it was removed mistakenly). Regards, Martn
[Martin v. Löwis]
That's all true. Of course, removing the branch won't free up any disk space - it will just remove the branch from the view (IOW, it is also easy to bring it back if it was removed mistakenly).
Right! I'm implicitly addressing a different issue, namely that two reasons for people disliking branches in CVS can "go away by magic" under SVN: 1. There's no way to attach a comment to a branch, explaining why it exists. In SVN, that's the checkin comment on the `copy` command that creates the branch. 2. Branches are in your face forever after, because the CVS docs strongly warn against trying to use the relevant commands even for tags (let alone branches). The CVS moral equivalent of "svn list repo/branches" keeps growing as a result, and shows up in each `cvs log`. The ever-growing clutter of long-obsolete info gets depressing <0.5 wink>. The easy possibility in SVN for "out of sight, out of mind" is a huge improvement.
Tim Peters wrote:
Just do it. Branches under SVN are cheap, go fast, and are pretty easy to work with. Even better, because a branch is just another named directory in SVN's virtual file system, you can "svn remove" it when you're done with it (just like any other directory).
footnote: if you want to make huge amounts of branches (e.g. a branch for each bug or optimization idea you're working on), I recommend using the SVK frontend instead of SVN: http://svk.elixus.org/ </F>
participants (4)
-
"Martin v. Löwis"
-
Fredrik Lundh
-
Phillip J. Eby
-
Tim Peters