IMHO, it's (much) easier to get an SVN checkout of the tree you're trying to sync with and then follow the procedures on that wiki page for SVN + Mercurial interaction. This allows two things:
1. You can easily stay up-to-date with SVN changes, even on release branches. 2. You can easily/directly commit back to SVN when ready (no need for additional patch files, etc.). It looks like you manually updated the hg repo to be v1.5, so I guess we can go from there (i.e., I'll review and send feedback). But in the future, you might want to try the above procedures, instead. That being said, I think we also need to update the SVN trunk to be the same version as what is going into v1.5 (trunk will eventually branch to become v1.7). Can you make an hg tree for trunk+new ROMIO? I'm sorry to ask for this, but we do need a way to go forward... :-\ Hopefully, it should be straightforward to apply the new ROMIO to the trunk (especially since you've already done the work to apply it to v1.4 and v1.5!). It's unfortunate that there's such a divergence between trunk and the v1.5 branch right now, but you *might* only have to adapt the build system stuff, per the email I sent to devel the other day (since not much else has changed in the IO MCA framework for a long time). FWIW, most people usually develop on the trunk and then port to a release branch. It's *usually* easier this way. Per above, there's a bit of divergence between the trunk and v1.5 right now, making this a little harder than it should be, but it's not too bad (especially for the IO MCA framework, as noted above). That being said, it's probably not too hard to port from the v1.5 branch to the trunk, either. On Jan 17, 2011, at 11:00 AM, Pascal Deveze wrote: > The bitbucket tree (https://bitbucket.org/devezep/new-romio-for-openmpi) has > just been updated with the open-mpi trunk. > > > I have made three patches: > > hg out > comparing with ssh://h...@bitbucket.org/devezep/new-romio-for-openmpi > searching for changes > changeset: 25:3e677102a125 > user: Pascal Deveze <pascal.dev...@bull.net> > date: Mon Jan 17 13:40:10 2011 +0100 > summary: Remove all files > > changeset: 26:e3989f46f83a > user: Pascal Deveze <pascal.dev...@bull.net> > date: Mon Jan 17 14:46:48 2011 +0100 > summary: Import from http://svn.open-mpi.org/svn/ompi/trunki (r24256) > > changeset: 27:97f54ec8a575 > tag: tip > user: Pascal Deveze <pascal.dev...@bull.net> > date: Mon Jan 17 16:14:06 2011 +0100 > summary: New Romio > > I have tested the result and the ROMIO tests are OK. > > > _______________________________________________ > devel mailing list > de...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/devel -- Jeff Squyres jsquy...@cisco.com For corporate legal information go to: http://www.cisco.com/web/about/doing_business/legal/cri/
