Re: [OMPI devel] workspace management question

2009-02-19 Thread Eugene Loh
Ralph Castain wrote: I think you are all over-engineering what is in truth a very, very simple procedure Yes, guilty as charged. I do dozens of times a day... Aha! Therein lies the difference. I haven't even done this a dozen times in my lifetime. and can best be "discovered" by sim

Re: [OMPI devel] workspace management question

2009-02-19 Thread Ralph Castain
I think you are all over-engineering what is in truth a very, very simple procedure I do dozens of times a day...and can best be "discovered" by simply doing "hg help" or looking at their great documentation for svn users. ;-) "svn add" takes as arguments the files that need to be added. I

Re: [OMPI devel] workspace management question

2009-02-19 Thread Eugene Loh
Terry Dontje wrote: Eugene Loh wrote: Okay, thanks for all the feedback. New version is at: https://svn.open-mpi.org/trac/ompi/wiki/UsingMercurial#Developmentcycle If everyone is happy with that, I'll remove the old version, along with the diagram. So I like the new text much better than

Re: [OMPI devel] workspace management question

2009-02-19 Thread Jeff Squyres
On Feb 19, 2009, at 12:14 PM, Eugene Loh wrote: Okay, thanks for all the feedback. New version is at: https://svn.open-mpi.org/trac/ompi/wiki/ UsingMercurial#Developmentcycle If everyone is happy with that, I'll remove the old version, along with the diagram. FWIW, I think your text is

Re: [OMPI devel] workspace management question

2009-02-19 Thread Terry Dontje
Eugene Loh wrote: Okay, thanks for all the feedback. New version is at: https://svn.open-mpi.org/trac/ompi/wiki/UsingMercurial#Developmentcycle If everyone is happy with that, I'll remove the old version, along with the diagram. So I like the new text much better than the old, but I think you

Re: [OMPI devel] workspace management question

2009-02-19 Thread Eugene Loh
Okay, thanks for all the feedback. New version is at: https://svn.open-mpi.org/trac/ompi/wiki/UsingMercurial#Developmentcycle If everyone is happy with that, I'll remove the old version, along with the diagram. Jeff Squyres wrote: Here's what I typically run to bring down changes from SVN

Re: [OMPI devel] workspace management question

2009-02-19 Thread Jeff Squyres
On Feb 19, 2009, at 10:16 AM, Eugene Loh wrote: But, I'd like to understand this better. Jeff's e-mail above has an "hg up" before the "svn up". But, I was trying to organize the steps in terms of stuff that propagates "from left to right" (from OMPI central repository out to HG clones) a

Re: [OMPI devel] workspace management question

2009-02-19 Thread Terry Dontje
Eugene Loh wrote: Terry Dontje wrote: Ralph Castain wrote: On Feb 19, 2009, at 5:39 AM, Terry Dontje wrote: Eugene Loh wrote: Jeff Squyres wrote: Here's what I typically run to bring down changes from SVN to HG: # Ensure all the latest hg repo changes are in the working dir hg up # Bri

Re: [OMPI devel] workspace management question

2009-02-19 Thread Eugene Loh
Terry Dontje wrote: Ralph Castain wrote: On Feb 19, 2009, at 5:39 AM, Terry Dontje wrote: Eugene Loh wrote: Jeff Squyres wrote: Here's what I typically run to bring down changes from SVN to HG: # Ensure all the latest hg repo changes are in the working dir hg up # Bring in all the SVN c

Re: [OMPI devel] workspace management question

2009-02-19 Thread Terry Dontje
Ralph Castain wrote: On Feb 19, 2009, at 5:39 AM, Terry Dontje wrote: Eugene Loh wrote: Jeff Squyres wrote: Here's what I typically run to bring down changes from SVN to HG: # Ensure all the latest hg repo changes are in the working dir hg up # Bring in all the SVN changes svn up # Refresh

Re: [OMPI devel] workspace management question

2009-02-19 Thread Ralph Castain
On Feb 19, 2009, at 5:39 AM, Terry Dontje wrote: Eugene Loh wrote: Jeff Squyres wrote: Here's what I typically run to bring down changes from SVN to HG: # Ensure all the latest hg repo changes are in the working dir hg up # Bring in all the SVN changes svn up # Refresh the .hgignore file (m

Re: [OMPI devel] workspace management question

2009-02-19 Thread Terry Dontje
Eugene Loh wrote: Jeff Squyres wrote: Here's what I typically run to bring down changes from SVN to HG: # Ensure all the latest hg repo changes are in the working dir hg up # Bring in all the SVN changes svn up # Refresh the .hgignore file (may change due to the svn up) ./contrib/hg/build-hgig

Re: [OMPI devel] workspace management question

2009-02-17 Thread Jeff Squyres
On Feb 17, 2009, at 5:50 PM, Eugene Loh wrote: As it has been spoken, so has it been done: https://svn.open-mpi.org/trac/ompi/wiki/ UsingMercurial#SyncingSVNandHGworkspaces That is schweet; thanks! (love the figure!) -- Jeff Squyres Cisco Systems

Re: [OMPI devel] workspace management question

2009-02-17 Thread Eugene Loh
Jeff Squyres wrote: Here's what I typically run to bring down changes from SVN to HG: # Ensure all the latest hg repo changes are in the working dir hg up # Bring in all the SVN changes svn up # Refresh the .hgignore file (may change due to the svn up) ./contrib/hg/build-hgignore.pl # Add / rem

Re: [OMPI devel] workspace management question

2009-02-17 Thread Jeff Squyres
Ah! Sorry; I thought we had some discussion about that but perhaps it was forgotten. :-\ Here's what I typically run to bring down changes from SVN to HG: # Ensure all the latest hg repo changes are in the working dir hg up # Bring in all the SVN changes svn up # Refresh the .hgignore file (

Re: [OMPI devel] workspace management question

2009-02-17 Thread Eugene Loh
I've been wading through this page over and over, but can't seem to find this particular tidbit. If you have the OMPI SVN repository, a combo SVN/HG area, and an HG clone (the pictures on that web page would have you going from left to right), then the page tells you: 1) How to populate thes

Re: [OMPI devel] workspace management question

2009-02-17 Thread Jeff Squyres
Check this wiki page out: https://svn.open-mpi.org/trac/ompi/wiki/UsingMercurial On Feb 17, 2009, at 12:36 PM, Eugene Loh wrote: Let's say I have a combo SVN/HG workspace. Let's say someone makes changes to the trunk. I guess I bring those over to my combo workspace with "svn up". Yes? H

[OMPI devel] workspace management question

2009-02-17 Thread Eugene Loh
Let's say I have a combo SVN/HG workspace. Let's say someone makes changes to the trunk. I guess I bring those over to my combo workspace with "svn up". Yes? How then do I make the HG side of the combo repository see those updates?