On Jan 7, 2008 2:37 PM, Eric Firing <[EMAIL PROTECTED]> wrote: > (At the moment I can't compile the branch--I just sent Mike a message > about that off the list, with voluminous output.) > > It seems like what is needed is not exactly a merge operation but simply > a renaming of the trunk and the branch. Maybe some doc files need to be > merged, but that is about it. Correct?
Sorry if I used sloppy terminology, all I mean is that Michael's stuff will become the HEAD of the svn trunk, and the current HEAD of the trunk will become a branch. No merge will be necessary since Michael has been merging all changes in the HEAD into his branch on a ongoing basis. I don't actually know how one does this move in svn, but I have faith that Michael does. > All this brings to mind the discussion taking place over the last week > on the numpy list regarding switching from svn to bzr or hg. > http://thread.gmane.org/gmane.comp.python.numeric.general/18130 > (I have been using hg locally for a couple years, and I like it.) The > motivation is the greater ease of branching and merging with distributed > VCS systems in comparison to SVN. In the numpy list discussion, it > sounds like all participants except Travis favor making the switch. I'm personally -1 on this. I prefer to keep things as simple as possible and do not see the need for a lot of branching, though there is clearly a need for some. svn is the standard version control system and has the best install base (now on OS X and all linux systems), making it easiest for users to get checkouts. If numpy, ipython and scipy all decide to move, I would probably be inclined to go along with it for consistency between these packages, but I wouldn't be leading the charge. I have never felt the need for a distributed version control system, personally, though some swear by it. It is probably because mpl has always just had a trunk with no branches, and I'd like to stick to that as much as possible, Michael, how onerous was it for you to do the merges using svn -- this seems to be the most significant problem with svn in my reading of David's summary. JDH ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
