From: Jens Seidel (jensseidel_at_[hidden])
Date: 2008-05-24 11:03:54
On Sat, May 24, 2008 at 01:41:01PM +0100, James Sharpe wrote:
> 2008/5/24 Jens Seidel <jensseidel_at_[hidden]>:
> > How about the usual name: branches/stable?
> Again let me reiterate, I'd advise against trying to keep a constant
Sorry for not carefully reading previous mails.
> branch name such as branches/release or branches/stable just because
> moving branches in the repository is a bad idea, just include the
> version number in the branch name! This kind of system works if you
> have a good merge tool, but quite frankly subversion is a rubbish tool
> for doing merges; distributed version control systems provide far
Is this true for Subversion 1.5 as well? This weekend will a release
candidate be published, the release is planned one week later. This
new merge command is interactive and seems to work well.
I don't know git (but try to use it) and merging in other distributed
version control systems (such as darcs, mercurial).
> better merge tools that enable this kind of integration to be done
> easily; again I refer people to the example of the linux kernel or git
> for how this kind of thing is done.
> > Maybe this could be renamed into branches/next_release.
> Try to avoid moving branches as I suggested earlier it makes it harder
> to migrate to other version control systems in the future and also
I can verify this for git-svn or however it is called (git functionaliy
over svn). I just assumed the migration tool is buggy and that one just
has to file a bug report (not yet done) ...
> plays havoc with working copies if a new branch with the previous name
> is then created again as subversion doesn't detect the move. This is
I think this has changed recently (ehm, I mean in 1.5):
* 'svn update' now sometimes copies or moves local files, for efficiency
> part of the reason I consider subversion's branching model of using
> paths for branches to be broken.
James, you should not consider software such as Subversion as static. If
you don't like a aspect and others agree with you just report it and
wait for the fix (or even better provide a patch).
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk