Comments on: Comparison of Configs/Aliases in Bazaar, CVS and Subversion http://blogs.gnome.org/jamesh/2005/08/29/comparison-of-configsaliases-in-bazaar-cvs-and-subversion/ Random stuff Mon, 07 Jul 2008 01:14:08 +0000 http://wordpress.org/?v=2.3.3 By: Erich Schubert http://blogs.gnome.org/jamesh/2005/08/29/comparison-of-configsaliases-in-bazaar-cvs-and-subversion/#comment-35 Erich Schubert Tue, 30 Nov 1999 00:00:00 +0000 http://blogs.gnome.org/jamesh/2005/08/29/comparison-of-configsaliases-in-bazaar-cvs-and-subversion/#comment-35 Hi, since you apparently are quite an expert on revision management - do you have a hint for my "CoW" problem?<br/>Basically I'd like to have copy-on-write branches.<br/>Meaning that I want files by default to follow the trunk branch, only if I modify the file it gets "locked" to the current branch. So that by running "foo update" I get all the updates, except for where I decided to diverge?<p/>using svn:externals was suggested to me, but it doesn't do the trick, I need it on a per-file basis. And I'd like to have it automatically, so I can just commit my changes and they'll end up in my "overlay" repository by default...<p/>Two blog entries, where I asked for advice for this usage:<br/><a href="http://blog.drinsama.de/erich/en/linux/2005082601-server-management.html">http://blog.drinsama.de/erich/en/linux/2005082601-server-management.html</a><br/><a href="http://blog.drinsama.de/erich/en/linux/2005082501-revision-management.html">http://blog.drinsama.de/erich/en/linux/2005082501-revision-management.html</a> Hi, since you apparently are quite an expert on revision management - do you have a hint for my “CoW” problem?
Basically I’d like to have copy-on-write branches.
Meaning that I want files by default to follow the trunk branch, only if I modify the file it gets “locked” to the current branch. So that by running “foo update” I get all the updates, except for where I decided to diverge?

using svn:externals was suggested to me, but it doesn’t do the trick, I need it on a per-file basis. And I’d like to have it automatically, so I can just commit my changes and they’ll end up in my “overlay” repository by default…

Two blog entries, where I asked for advice for this usage:
http://blog.drinsama.de/erich/en/linux/2005082601-server-management.html
http://blog.drinsama.de/erich/en/linux/2005082501-revision-management.html

]]> By: James Henstridge http://blogs.gnome.org/jamesh/2005/08/29/comparison-of-configsaliases-in-bazaar-cvs-and-subversion/#comment-36 James Henstridge Tue, 30 Nov 1999 00:00:00 +0000 http://blogs.gnome.org/jamesh/2005/08/29/comparison-of-configsaliases-in-bazaar-cvs-and-subversion/#comment-36 With Bazaar, the way you'd handle this would be by branching the upstream. Now rather than running "update", you'd "merge" from the upstream branch, fix conflicts (if there are any), and "commit".<p/>To see what your local changes are, just diff your branch against the upstream one.<p/>This is not quite the same as you asked for, since you will get updates to files you have modified (hence the possibility of conflicts on merge). However, this is usually considered a better system, since using some files from one version and other files from another version could easily cause problems. With Bazaar, the way you’d handle this would be by branching the upstream. Now rather than running “update”, you’d “merge” from the upstream branch, fix conflicts (if there are any), and “commit”.

To see what your local changes are, just diff your branch against the upstream one.

This is not quite the same as you asked for, since you will get updates to files you have modified (hence the possibility of conflicts on merge). However, this is usually considered a better system, since using some files from one version and other files from another version could easily cause problems.

]]> By: Sean Kelley http://blogs.gnome.org/jamesh/2005/08/29/comparison-of-configsaliases-in-bazaar-cvs-and-subversion/#comment-37 Sean Kelley Tue, 30 Nov 1999 00:00:00 +0000 http://blogs.gnome.org/jamesh/2005/08/29/comparison-of-configsaliases-in-bazaar-cvs-and-subversion/#comment-37 Very interesting. I've not used CVS since University. I must confess that in my job I've been using Borland's StarTeam and love it.It is really hard to go back to the command line again.<p/>Sean Very interesting. I’ve not used CVS since University. I must confess that in my job I’ve been using Borland’s StarTeam and love it.It is really hard to go back to the command line again.

Sean

]]> By: fraggle http://blogs.gnome.org/jamesh/2005/08/29/comparison-of-configsaliases-in-bazaar-cvs-and-subversion/#comment-38 fraggle Tue, 30 Nov 1999 00:00:00 +0000 http://blogs.gnome.org/jamesh/2005/08/29/comparison-of-configsaliases-in-bazaar-cvs-and-subversion/#comment-38 Sounds like incredibly useless and confusing functionality and that a common shared library would be a much better solution. Sounds like incredibly useless and confusing functionality and that a common shared library would be a much better solution.

]]>