Andrew Straw wrote: > Jouni K. Seppänen wrote: > >> I coded up what I think is an improvement, but since it has a lot of >> potential to break something and release time is near, I didn't commit >> my changes into svn. I tried playing around with git, to see if it is >> useful for communicating patches. > > I think it's useful. > >> Any git gurus out there: is this the "right" way for using git to discuss >> patches, or am I missing something? > > Yes, as much as there is one... My git mirror isn't automatically synced > so often falls behind a bit - as it was when you did this (I have just > now updated, though). Furthermore, I recently discovered that I > collapsed a bunch of svn commits into a single big git commit (the git > repo's idea of svn r7100 contains a lot more than the real svn r7100). > So, the branch currently labeled "master" in my github repository should > not become the cannonical git repository. (Of course, it will be very > easy to label the correct branch -- when it gets made -- "master".) > > Anyhow, now that I've pushed up a more recent master, assuming you want > to apply your work onto that, you could either rebase your commits onto > the master -- thus ignoring the true historical state you developed them > against -- or merge the master branch -- causing the history to be more > complicated, as it's no longer linear. > > And now that we're talking about this, Eric, as the only MPL dev that I > know who prefers Hg over git, have you seen > http://github.com/blog/439-hg-git-mercurial-plugin and would you be > willing to try it out? I'd be very interested to know if it could make a > git central repo work seamlessly for both Hg and git clients.
I had not seen it until you mentioned it above. Now I downloaded it, enabled it, and tried to make a clone of Jouni's repo. Hit an exception. It's probably because I am using a newer version of hg than what hg-git is being developed with. This will take a little time to sort out. I'm moderately optimistic about hg-git despite hitting that pothole; I suspect hg-git interoperability is much easier than interoperability of either with svn. For the latter, I have been doing some testing of hgsubversion, but I am quite leery of trying to work routinely with a central svn and local dvcs. In any case, I can work with git if I have to (although after some experience with git I still think that hg is *much* easier to learn and use casually), and I really would like to see numpy and mpl both move completely to either git or hg. And it doesn't even have to be the same one for both. Eric ------------------------------------------------------------------------------ OpenSolaris 2009.06 is a cutting edge operating system for enterprises looking to deploy the next generation of Solaris that includes the latest innovations from Sun and the OpenSource community. Download a copy and enjoy capabilities such as Networking, Storage and Virtualization. Go to: http://p.sf.net/sfu/opensolaris-get _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
