[WAM-IPE] WAM-IPE r93143: modified to point my branch to its externals

Tue May 23 19:26:13 UTC 2017

weiyu

Sure - I'll wait for your commits.

Cheers

George.

On Tue, May 23, 2017 at 1:05 PM, weiyu yang <weiyu.yang at noaa.gov> wrote:

> George,
>
> I am ready to commit my restart changes.  I am waiting for the today's
> trunk version to be fixed then I can run the final regression tests and
> commit ( I passed all regression tests related to the WAM model run
> already).  You might wait after my commit.  Thank you very much.
>
> Best regards
> Weiyu
>
>
>
> On 5/23/2017 2:42 PM, George Millward - NOAA Affiliate wrote:
>
> Do we now have everything committed so I can create a branch to build the
> WCOSS-realtime version ?
>
> Cheers
>
> George.
>
>
>
> On Tue, May 23, 2017 at 12:39 PM, Naomi Maruyama <naomi.maruyama at noaa.gov>
> wrote:
>
>> Sam, Bob
>>
>> Thanks for your help.
>>
>> I corrected it.
>>
>> naomi
>>
>> On 05/23/2017 06:33 PM, Robert Oehmke wrote:
>>
>> Hi Sam,
>>
>> No worries. We can correct it in Naomi’s doc.  I experimented around some
>> with this and I think I have a better idea of how things work, so I’ll go
>> through and edit the doc to capture that.
>>
>> Naomi, do you want to correct the externals or should I?
>>
>> Thanks,
>>
>> - Bob
>>
>>
>>
>>
>> On May 23, 2017, at 12:18 PM, Samuel Trahan - NOAA Affiliate <
>> samuel.trahan at noaa.gov> wrote:
>>
>> Bob,
>>
>> Oopes.  Yes, my instructions told people to edit the trunk instead of
>> their branch.   Sorry about that.  How do we correct that document?
>>
>> Someone needs to fix the trunk externals though.
>>
>> Sincerely,
>> Sam Trahan
>>
>> On Tue, May 23, 2017 at 2:15 PM, Robert Oehmke <robert.oehmke at noaa.gov>
>> wrote:
>>
>>> Hi Sam,
>>>
>>>   I was looking at the instructions that you sent me awhile ago. See
>>> below.
>>>
>>> I think that the line under point 3 is not correct. Instead of this:
>>>
>>>     svn propedit svn:externals https://svnemc.n
>>> cep.noaa.gov/projects/nems/apps/WAM-IPE/trunk
>>>
>>> I think that it should be this:
>>>     svn propedit svn:externals https://svnemc.n
>>> cep.noaa.gov/projects/nems/apps/WAM-IPE/branches/bob
>>>
>>> Is that right?
>>>
>>> Thanks,
>>>
>>> - Bob
>>>
>>>
>>> ==============
>>>
>>> Bob,
>>>
>>> If you do an "svn status -q" from the top level, it will list all
>>> changed files.  There may be a few compiler intermediate files listed as
>>> "new" files (lines beginning with a "?")
>>>
>>> In your situation, the best option is the "patch" command.  Let's say
>>> your old checkout is in the directory "old-checkout."  Do this:
>>>
>>> 1. For each file you modified, run this command:
>>>
>>>     svn diff old-checkout/path/to/file.f > old-checkout/path/to/file.f.di
>>> ff
>>>
>>> The file.f.diff contains a Unified Format Diff listing all local changes
>>> in that file.
>>>
>>> 2. Make a branch of the trunk.  One of these commands may fail if you do
>>> not have access to a repository.
>>>
>>>     svn cp -m "branch for merging Bob's changes" \
>>>     https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk \
>>>     https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/branches/bob
>>>
>>>     svn cp -m "branch for merging Bob's changes" \    svn cp -m "branch
>>> for merging Bob's wam-ipe changes" \
>>>     https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-
>>> IPE/quasitrunk \
>>>     https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob
>>>
>>>     svn cp -m "branch for merging Bob's wam-ipe changes" \
>>>     https://github.com/IonospherePlasmasphereElectrodynamics/ipe/trunk \
>>>     https://github.com/IonospherePlasmasphereElectrodynamics
>>> /ipe/branches/bob
>>>
>>> 3. Point your branch to its externals
>>>
>>>     svn propedit svn:externals https://svnemc.n
>>> cep.noaa.gov/projects/nems/apps/WAM-IPE/trunk
>>>
>>> That should open a text editor (unless you did not set the EDITOR
>>> variable).  Change the IPELIB and NEMS lines to point to your branches.  Do
>>> not change other lines.
>>>
>>> NEMS https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob
>>> IPELIB  https://github.com/IonospherePlasmasphereElectrodyna
>>> mics/ipe/branches/bob
>>>
>>> 4. Check out your branch:
>>>
>>>     svn co https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/b
>>> ranches/bob
>>>
>>> That will make a directory called "bob" containing your branch.
>>>
>>> 5. Apply the diff for each file, using the "patch" command.
>>>
>>>     patch --unified --forward --merge  bob/path/to/file.f
>>> old-checkout/path/to/file.f.diff
>>>
>>> That will act similarly to the "svn merge" command, merging your
>>> old-checkout working copy changes to the trunk files.  Conflicts will show
>>> up in the file.f like this:
>>>
>>>               <<<<<<<
>>>               lines from the original file
>>>               |||||||
>>>               original lines from the patch
>>>               =======
>>>               new lines from the patch
>>>               >>>>>>>
>>>
>>> 6. Make sure your branch compiles and runs.
>>>
>>> 7. Commit your changes using the "svn commit" command.  Make sure you
>>> commit all files- note that you have to do separate commits in the NEMS,
>>> application, and IPELIB areas since they are different repositories.
>>>
>>> Sincerely,
>>> Sam Trahan
>>>
>>>
>>> ====
>>>
>>>
>>>
>>> On May 23, 2017, at 12:08 PM, Samuel Trahan - NOAA Affiliate <
>>> samuel.trahan at noaa.gov> wrote:
>>>
>>> Naomi,
>>>
>>> You made the same mistake as Bob.  You changed the trunk's NEMS and
>>> IPELIB to point to your branches.
>>>
>>> Sincerely,
>>> Sam Trahan
>>>
>>> On Tue, May 23, 2017 at 1:28 PM, <Samuel.Trahan at noaa.gov> wrote:
>>>
>>>> Friendly WAM-IPE developers,
>>>>
>>>> This is an automated email about a WAM-IPE commit.
>>>>
>>>> Project: WAM-IPE
>>>> URL: https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk
>>>> Revision: 93143
>>>> Author:   naomi.maruyama at noaa.gov
>>>> Date:     2017-05-23T17:18:30.201346Z
>>>> Message:
>>>> modified to point my branch to its externals
>>>>
>>>>
>>>> Differences:
>>>> Index: checkout
>>>> ===================================================================
>>>> --- checkout    (revision 92991)
>>>> +++ checkout    (revision 93143)
>>>>
>>>> Property changes on: checkout
>>>> ___________________________________________________________________
>>>> Modified: svn:externals
>>>> ## -1,7 +1,7 ##
>>>> -              NEMS  -r92673 https://svnemc.ncep.noaa.gov/p
>>>> rojects/nems/branches/WAM-IPE/quasitrunk
>>>> +              NEMS  -r92673 https://svnemc.ncep.noaa.gov/p
>>>> rojects/nems/branches/WAM-IPE/naomi
>>>>  NEMS/src/atmos/gsm  -r90126 https://svnemc.ncep.noaa.gov/p
>>>> rojects/gsm/branches/WAM-IPE/quasitrunk
>>>>  NEMS/src/atmos/nmm  -r85687 https://svnemc.ncep.noaa.gov/p
>>>> rojects/nems/external_comps/NMM
>>>> -            IPELIB          https://github.com/IonosphereP
>>>> lasmasphereElectrodynamics/ipe/branches/bob
>>>> +            IPELIB          https://github.com/IonosphereP
>>>> lasmasphereElectrodynamics/ipe/branches/naomi
>>>>                 IPE  -r85943 https://svnemc.ncep.noaa.gov/p
>>>> rojects/ipe/branches/nuopc_cap
>>>>             DATAWAM  -r73436 https://svnemc.ncep.noaa.gov/p
>>>> rojects/nems/external_comps/DATAWAM/trunk
>>>>             DATAIPE  -r65981 https://svnemc.ncep.noaa.gov/p
>>>> rojects/nems/external_comps/DATAIPE/trunk
>>>>
>>>
>>> _______________________________________________
>>> WAM-IPE mailing list
>>> WAM-IPE at lstsrv.ncep.noaa.gov
>>> 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 <%28303%29%20497-4857>
>> email: naomi.maruyama at noaa.gov
>>
>>
>
>
> --
> --
> ----------------------------------------------------------------
> Dr. George Millward
> Cooperative Institute for Research in Environmental Sciences (CIRES)
> University of Colorado, Boulder
>
> Visiting scientist at
> NOAA Space Weather Prediction Center
> 325 Broadway, Boulder, CO 80305
> Tel: 303-497-6775 <(303)%20497-6775>
>
> george.millward at noaa.gov
> ----------------------------------------------------------------
>
>
>

-- 
-- 
----------------------------------------------------------------
Dr. George Millward
Cooperative Institute for Research in Environmental Sciences (CIRES)
University of Colorado, Boulder

Visiting scientist at
NOAA Space Weather Prediction Center
325 Broadway, Boulder, CO 80305
Tel: 303-497-6775

george.millward at noaa.gov
----------------------------------------------------------------
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://www.lstsrv.ncep.noaa.gov/pipermail/wam-ipe/attachments/20170523/094e222f/attachment-0001.html 