[WAM-IPE] WAM-IPE trunk external for NEMS points to non-existent branch
Naomi Maruyama
naomi.maruyama at noaa.gov
Fri May 19 18:37:30 UTC 2017
Bob
thanks a lot for your clarifying the proper procedure.
It would be very helpful for everybody to understand exactly what to follow.
I am going to create a shared instruction document with everybody based
on your bullets.
thanks.
naomi
On 05/19/2017 05:54 PM, Robert Oehmke wrote:
> That’s interesting because when I was doing my checkins to test my
> access, I was doing them in the “bob” branch, so they should have just
> stayed there. I didn’t use the process that I described on the trunk.
> Weird.
>
> I was thinking that the development process that I was describing was
> taking place in a branch, but from what you say we don’t need to be
> that careful there.
>
> So is the following what you’re talking about for development?
>
> + Make branch (e.g. bob_dev)
> - including branch versions of external repositories
>
> + Checkout branch
>
> + In branch edit externals to point to trunks of branch versions of
> externals
>
> + Do I then need to commit this and recheck out my branch??
>
> + Edit files
>
> + Commit these (they’ll go to the branch)
>
> + When I’m happy with the changes, have my friendly neighborhood code
> manager merge the changes from my branch to the trunk
> As part of this they will:
> - modify the trunk externals to point to the updated versions of
> the repositories
> - update the test baselines to reflect the most recent results
>
>
> Sorry to be so pesky about this, but I want to make sure that I’m
> doing what you intend with the branches and externals.
>
> Thanks for your help.
>
> - Bob
>
>
> On May 19, 2017, at 11:22 AM, Samuel Trahan - NOAA Affiliate
> <samuel.trahan at noaa.gov <mailto:samuel.trahan at noaa.gov>> wrote:
>
>> Bob,
>>
>> No. You should work in a branch, and your working (disk) copy should
>> be a checkout of your branch. If you followed the process you
>> described, then you probably committed local changes to the
>> svn:externals. If you work in a branch instead, you can change
>> externals all you want without accidentally changing the trunk.
>>
>> Sincerely,
>> Sam Trahan
>>
>> On Fri, May 19, 2017 at 1:17 PM, Robert Oehmke
>> <robert.oehmke at noaa.gov <mailto:robert.oehmke at noaa.gov>> wrote:
>>
>> Sure. That makes sense. The thing that I’m unclear on is the
>> details of the development process. When we check out WAM-IPE
>> we’ll be at specific revisions, so we’re not modifying the trunk.
>>
>> For development do we do something like this:
>>
>> + Update the repository that we’re editing to the trunk version
>> - cd into the repository directory
>> - do svn update to bring the local version up to the trunk
>>
>> + Make changes to files
>>
>> + Check in changes
>> - do svn commit
>>
>> + Change externals to point to latest revision of that repository
>>
>> Is that the process?
>>
>> Thanks,
>>
>> - Bob
>>
>>
>>
>> On May 19, 2017, at 10:59 AM, Samuel Trahan - NOAA Affiliate
>> <samuel.trahan at noaa.gov <mailto:samuel.trahan at noaa.gov>> wrote:
>>
>>> Bob,
>>>
>>> The externals for the trunk should always point to a revision in
>>> a Subversion repository or a tag in a git repository. This
>>> ensures you know exactly what version of each component is in
>>> use. That means you can make branches or tags of the trunk
>>> without having to manually make branches and tags of each
>>> component. It also makes execution easier for the trunk- you
>>> can run a particular version of the trunk against a particular
>>> version of the compset input/output data.
>>>
>>> Sincerely,
>>> Sam Trahan
>>>
>>>
>>>
>>> On Fri, May 19, 2017 at 12:04 PM, Robert Oehmke
>>> <robert.oehmke at noaa.gov <mailto:robert.oehmke at noaa.gov>> wrote:
>>>
>>> Hi Sam,
>>>
>>> Ok, I’ll give this a try. I guess that I’ll point it to
>>> the last version since all the changes from 91075 to then
>>> seen neutral. Could we just point to the trunk version of
>>> everything? Or is the idea to have some fixed version of all
>>> the repositories? If we want to edit something do we switch
>>> to the most recent version to go forward with?
>>>
>>> Thanks,
>>>
>>> - Bob
>>>
>>> On May 19, 2017, at 9:44 AM, Samuel Trahan - NOAA Affiliate
>>> <samuel.trahan at noaa.gov <mailto:samuel.trahan at noaa.gov>> wrote:
>>>
>>>> Hi,
>>>>
>>>> To correct the problem:
>>>>
>>>> svn propedit svn:externals
>>>> https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk
>>>> <https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk>
>>>>
>>>> Then change this line:
>>>>
>>>> NEMS -r90130
>>>> https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob
>>>> <https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob>
>>>>
>>>> to point to a revision of the "quasitrunk" branch of NEMS:
>>>>
>>>> NEMS -r???
>>>> https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/quasitrunk
>>>> <https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/quasitrunk>
>>>>
>>>> Replace ??? with the correct revision. Then save the file
>>>> and exit your editor. An editor will be opened again so
>>>> you can add a "commit message." Add a message and exit,
>>>> then it will commit for you.
>>>>
>>>>
>>>> I'm not sure what revision (-r???) is the correct one. The
>>>> top of the branch is revision 92673. Bob committed a
>>>> change, "update mediator to be the same as milestone 0.5,"
>>>> on April 10. After that, the changes have been access
>>>> tests. (See below.)
>>>>
>>>> svn log
>>>> https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/quasitrunk|head
>>>> <https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/quasitrunk%7Chead>
>>>> -20
>>>> ------------------------------------------------------------------------
>>>> r92673 | raffaele.montuoro at noaa.gov
>>>> <mailto:raffaele.montuoro at noaa.gov> | 2017-05-12 17:16:13
>>>> +0000 (Fri, 12 May 2017) | 1 line
>>>>
>>>> revert changes from previous test commit
>>>> ------------------------------------------------------------------------
>>>> r92666 | raffaele.montuoro at noaa.gov
>>>> <mailto:raffaele.montuoro at noaa.gov> | 2017-05-12 17:02:15
>>>> +0000 (Fri, 12 May 2017) | 1 line
>>>>
>>>> test commit
>>>> ------------------------------------------------------------------------
>>>> r92611 | robert.oehmke at noaa.gov
>>>> <mailto:robert.oehmke at noaa.gov> | 2017-05-10 22:48:57 +0000
>>>> (Wed, 10 May 2017) | 1 line
>>>>
>>>> test access
>>>> ------------------------------------------------------------------------
>>>> r91075 | robert.oehmke at noaa.gov
>>>> <mailto:robert.oehmke at noaa.gov> | 2017-04-10 19:31:20 +0000
>>>> (Mon, 10 Apr 2017) | 1 line
>>>>
>>>> Update mediator to be the same as milestone 0.5
>>>> ------------------------------------------------------------------------
>>>> r90318 | samuel.trahan at noaa.gov
>>>> <mailto:samuel.trahan at noaa.gov> | 2017-03-28 14:48:32 +0000
>>>> (Tue, 28 Mar 2017) | 1 line
>>>>
>>>> delete test directory
>>>>
>>>>
>>>> On Fri, May 19, 2017 at 10:56 AM, weiyu yang
>>>> <weiyu.yang at noaa.gov <mailto:weiyu.yang at noaa.gov>> wrote:
>>>>
>>>> I have a suggestion that the WAM-IPE trunk should have
>>>> only basic necessary external link, such as GSM, IPE,
>>>> etc. Everyone's personal branch should not be linked to
>>>> the WAM-IPE trunk. They may copy whole trunk as their
>>>> personal branch and work on it.
>>>> Weiyu
>>>>
>>>>
>>>> On 5/19/2017 8:36 AM, Samuel Trahan - NOAA Affiliate wrote:
>>>>> Bob,
>>>>>
>>>>> Yes, but make sure you point to the correct revision
>>>>> of the quasitrunk
>>>>>
>>>>> Sincerely,
>>>>> Sam Trahan
>>>>>
>>>>> On Thu, May 18, 2017 at 5:45 PM, Robert Oehmke
>>>>> <robert.oehmke at noaa.gov
>>>>> <mailto:robert.oehmke at noaa.gov>> wrote:
>>>>>
>>>>>
>>>>> Yep, that’s true, maybe it happened when I was
>>>>> testing my access. I guess the important thing is
>>>>> how to fix it? Do I just change the externals back
>>>>> to point to the trunk and then commit?
>>>>>
>>>>> Thanks,
>>>>>
>>>>> - Bob
>>>>>
>>>>> On May 18, 2017, at 3:15 PM, Samuel Trahan - NOAA
>>>>> Affiliate <samuel.trahan at noaa.gov
>>>>> <mailto:samuel.trahan at noaa.gov>> wrote:
>>>>>
>>>>>> Bob,
>>>>>>
>>>>>> Someone modified the trunk externals. You may
>>>>>> have done that by accident when attempting to
>>>>>> modify your branch or commit to the trunk. The
>>>>>> trunk points to a branch that does not exist at
>>>>>> the specified revision (90130, I think).
>>>>>>
>>>>>> Sincerely,
>>>>>> Sam Trahan
>>>>>>
>>>>>> On Thu, May 18, 2017 at 3:49 PM, Robert Oehmke
>>>>>> <robert.oehmke at noaa.gov
>>>>>> <mailto:robert.oehmke at noaa.gov>> wrote:
>>>>>>
>>>>>> Hi Sam,
>>>>>>
>>>>>> The bob branch is what I made from your
>>>>>> instructions awhile ago and what I’ve been
>>>>>> working in. Is the reason that you’re not
>>>>>> seeing it because it’s just local to me?
>>>>>>
>>>>>> As far as I know I haven’t modified the
>>>>>> externals. At one point I edited the
>>>>>> externals file following your instructions to
>>>>>> work on a branch, but that was months ago.
>>>>>>
>>>>>> While I’m talking to you I have a question
>>>>>> about what information you want by May 19th.
>>>>>> Is the information you want who needs access
>>>>>> to what in general (independent of whether
>>>>>> they already have it or not), or who needs
>>>>>> *new* access to what (i.e. that is if they
>>>>>> already have access to something, you don’t
>>>>>> want to hear about it).
>>>>>>
>>>>>> Thanks,
>>>>>>
>>>>>> - Bob
>>>>>>
>>>>>> On May 18, 2017, at 1:31 PM, Samuel Trahan -
>>>>>> NOAA Affiliate <samuel.trahan at noaa.gov
>>>>>> <mailto:samuel.trahan at noaa.gov>> wrote:
>>>>>>
>>>>>>> Hi,
>>>>>>>
>>>>>>> The WAM-IPE trunk points to a non-existent
>>>>>>> "bob" branch of NEMS. Did someone change
>>>>>>> that external by accident?
>>>>>>>
>>>>>>> WAM-IPE trunk:
>>>>>>>
>>>>>>> https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk
>>>>>>> <https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk>
>>>>>>>
>>>>>>> externals:
>>>>>>>
>>>>>>> svn propget svn:externals
>>>>>>> https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk
>>>>>>> <https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk>
>>>>>>> NEMS -r90130
>>>>>>> https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob
>>>>>>> <https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob>
>>>>>>> NEMS/src/atmos/gsm -r90126
>>>>>>> https://svnemc.ncep.noaa.gov/projects/gsm/branches/WAM-IPE/quasitrunk
>>>>>>> <https://svnemc.ncep.noaa.gov/projects/gsm/branches/WAM-IPE/quasitrunk>
>>>>>>> NEMS/src/atmos/nmm -r85687
>>>>>>> https://svnemc.ncep.noaa.gov/projects/nems/external_comps/NMM
>>>>>>> <https://svnemc.ncep.noaa.gov/projects/nems/external_comps/NMM>
>>>>>>> IPELIB
>>>>>>> https://github.com/IonospherePlasmasphereElectrodynamics/ipe/branches/bob
>>>>>>> <https://github.com/IonospherePlasmasphereElectrodynamics/ipe/branches/bob>
>>>>>>> IPE -r85943
>>>>>>> https://svnemc.ncep.noaa.gov/projects/ipe/branches/nuopc_cap
>>>>>>> <https://svnemc.ncep.noaa.gov/projects/ipe/branches/nuopc_cap>
>>>>>>> DATAWAM -r73436
>>>>>>> https://svnemc.ncep.noaa.gov/projects/nems/external_comps/DATAWAM/trunk
>>>>>>> <https://svnemc.ncep.noaa.gov/projects/nems/external_comps/DATAWAM/trunk>
>>>>>>> DATAIPE -r65981
>>>>>>> https://svnemc.ncep.noaa.gov/projects/nems/external_comps/DATAIPE/trunk
>>>>>>> <https://svnemc.ncep.noaa.gov/projects/nems/external_comps/DATAIPE/trunk>
>>>>>>>
>>>>>>> The "bob" branch of WAM-IPE does not exist
>>>>>>> at that revision.
>>>>>>>
>>>>>>> svn info
>>>>>>> https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob@90130
>>>>>>> <https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob@90130>
>>>>>>> svn: warning: W170000: URL
>>>>>>> 'https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob
>>>>>>> <https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob>'
>>>>>>> non-existent in revision 90130
>>>>>>>
>>>>>>> _______________________________________________
>>>>>>> WAM-IPE mailing list
>>>>>>> WAM-IPE at lstsrv.ncep.noaa.gov
>>>>>>> <mailto:WAM-IPE at lstsrv.ncep.noaa.gov>
>>>>>>> https://www.lstsrv.ncep.noaa.gov/mailman/listinfo/wam-ipe
>>>>>>> <https://www.lstsrv.ncep.noaa.gov/mailman/listinfo/wam-ipe>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>> _______________________________________________
>>>> WAM-IPE mailing list
>>>> WAM-IPE at lstsrv.ncep.noaa.gov
>>>> <mailto:WAM-IPE at lstsrv.ncep.noaa.gov>
>>>> https://www.lstsrv.ncep.noaa.gov/mailman/listinfo/wam-ipe
>>>> <https://www.lstsrv.ncep.noaa.gov/mailman/listinfo/wam-ipe>
>>>
>>>
>>
>>
>
--
--------------------------------------
Naomi Maruyama
CIRES, Univ. of Colorado at Boulder
NOAA Space Weather Prediction Center
phone: +1 303-497-4857
email: naomi.maruyama at noaa.gov
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://www.lstsrv.ncep.noaa.gov/pipermail/wam-ipe/attachments/20170519/846e040b/attachment-0001.html
More information about the WAM-IPE
mailing list