<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html;
      charset=windows-1252">
  </head>
  <body text="#000000" bgcolor="#FFFFFF">
    <p>Sam, Bob<br>
    </p>
    <p>Thanks for your help.</p>
    <p>I corrected it.</p>
    <p>naomi<br>
    </p>
    <br>
    <div class="moz-cite-prefix">On 05/23/2017 06:33 PM, Robert Oehmke
      wrote:<br>
    </div>
    <blockquote type="cite"
      cite="mid:E91587D4-F864-4F3C-A376-3AE5D69A8927@noaa.gov">
      <meta http-equiv="Content-Type" content="text/html;
        charset=windows-1252">
      <div>Hi Sam,</div>
      <div><br>
      </div>
      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. 
      <div><br>
      </div>
      <div>Naomi, do you want to correct the externals or should I? </div>
      <div><br>
      </div>
      <div>Thanks,</div>
      <div><br>
      </div>
      <div>- Bob<br>
        <div><br>
        </div>
        <div><br>
        </div>
        <div><br>
        </div>
        <div><br>
          <div>
            <div>On May 23, 2017, at 12:18 PM, Samuel Trahan - NOAA
              Affiliate &lt;<a href="mailto:samuel.trahan@noaa.gov"
                moz-do-not-send="true">samuel.trahan@noaa.gov</a>&gt;
              wrote:</div>
            <br class="Apple-interchange-newline">
            <blockquote type="cite">
              <div dir="ltr">
                <div>
                  <div>
                    <div>
                      <div>Bob,<br>
                        <br>
                      </div>
                      Oopes.  Yes, my instructions told people to edit
                      the trunk instead of their branch.   Sorry about
                      that.  How do we correct that document?<br>
                      <br>
                    </div>
                    Someone needs to fix the trunk externals though.<br>
                    <br>
                  </div>
                  Sincerely,<br>
                </div>
                Sam Trahan<br>
              </div>
              <div class="gmail_extra"><br>
                <div class="gmail_quote">On Tue, May 23, 2017 at 2:15
                  PM, Robert Oehmke <span dir="ltr">&lt;<a
                      href="mailto:robert.oehmke@noaa.gov"
                      target="_blank" moz-do-not-send="true">robert.oehmke@noaa.gov</a>&gt;</span>
                  wrote:<br>
                  <blockquote class="gmail_quote" style="margin:0 0 0
                    .8ex;border-left:1px #ccc solid;padding-left:1ex">
                    <div style="word-wrap:break-word">Hi Sam,
                      <div><br>
                      </div>
                      <div>  I was looking at the instructions that you
                        sent me awhile ago. See below. </div>
                      <div><br>
                      </div>
                      <div>I think that the line under point 3 is not
                        correct. Instead of this: </div>
                      <div><br>
                      </div>
                      <div>    svn propedit svn:externals <a
                          href="https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk"
                          target="_blank" moz-do-not-send="true">https://svnemc.<wbr>ncep.noaa.gov/projects/nems/<wbr>apps/WAM-IPE/trunk</a><br>
                      </div>
                      <div><br>
                      </div>
                      <div>I think that it should be this: </div>
                      <div>    svn propedit svn:externals <a
href="https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/branches/bob"
                          target="_blank" moz-do-not-send="true">https://svnemc.<wbr>ncep.noaa.gov/projects/nems/<wbr>apps/WAM-IPE/branches/bob</a></div>
                      <div><br>
                      </div>
                      <div>Is that right? </div>
                      <div><br>
                      </div>
                      <div>Thanks,</div>
                      <div><br>
                      </div>
                      <div>- Bob</div>
                      <div><br>
                      </div>
                      <div><br>
                      </div>
                      <div>==============</div>
                      <div><br>
                      </div>
                      <div>
                        <div>
                          <div>
                            <div>
                              <div>
                                <div>
                                  <div>
                                    <div>
                                      <div>
                                        <div>
                                          <div>
                                            <div>
                                              <div>
                                                <div>Bob,<br>
                                                  <br>
                                                </div>
                                                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
                                                "?")  <br>
                                                <br>
                                              </div>
                                              In your situation, the
                                              best option is the "patch"
                                              command.  Let's say your
                                              old checkout is in the
                                              directory "old-checkout." 
                                              Do this:<br>
                                              <br>
                                            </div>
                                            1. For each file you
                                            modified, run this command:<br>
                                            <br>
                                          </div>
                                              svn diff
                                          old-checkout/path/to/file.f
                                          &gt;
                                          old-checkout/path/to/file.f.<wbr>diff<br>
                                          <br>
                                        </div>
                                        The file.f.diff contains a
                                        Unified Format Diff listing all
                                        local changes in that file.<br>
                                        <br>
                                      </div>
                                      <div>2. Make a branch of the
                                        trunk.  One of these commands
                                        may fail if you do not have
                                        access to a repository.<br>
                                        <br>
                                      </div>
                                      <div>    svn cp -m "branch for
                                        merging Bob's changes" \<br>
                                            <a
                                          href="https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk"
                                          target="_blank"
                                          moz-do-not-send="true">https://svnemc.ncep.noaa.<wbr>gov/projects/nems/apps/WAM-<wbr>IPE/trunk</a> \<br>
                                      </div>
                                      <div>    <a
href="https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/branches/bob"
                                          target="_blank"
                                          moz-do-not-send="true">https://svnemc.ncep.noaa.<wbr>gov/projects/nems/apps/WAM-<wbr>IPE/branches/bob</a><br>
                                        <br>
                                      </div>
                                      <div>    svn cp -m "branch for
                                        merging Bob's changes" \    svn
                                        cp -m "branch for merging Bob's
                                        wam-ipe changes" \<br>
                                      </div>
                                          <a
href="https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/quasitrunk"
                                        target="_blank"
                                        moz-do-not-send="true">https://svnemc.ncep.noaa.<wbr>gov/projects/nems/branches/<wbr>WAM-IPE/quasitrunk</a> \<br>
                                          <a
                                        href="https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob"
                                        target="_blank"
                                        moz-do-not-send="true">https://svnemc.ncep.noaa.<wbr>gov/projects/nems/branches/<wbr>WAM-IPE/bob</a><br>
                                      <div><br>
                                      </div>
                                      <div>    svn cp -m "branch for
                                        merging Bob's wam-ipe changes" \<br>
                                            <a
href="https://github.com/IonospherePlasmasphereElectrodynamics/ipe/trunk"
                                          target="_blank"
                                          moz-do-not-send="true">https://github.com/<wbr>IonospherePlasmasphereElectrod<wbr>ynamics/ipe/trunk</a> \<br>
                                      </div>
                                      <div>    <a
href="https://github.com/IonospherePlasmasphereElectrodynamics/ipe/branches/bob"
                                          target="_blank"
                                          moz-do-not-send="true">https://github.com/<wbr>IonospherePlasmasphereElectrod<wbr>ynamics/ipe/branches/bob</a><br>
                                        <br>
                                      </div>
                                      <div>3. Point your branch to its
                                        externals<br>
                                        <br>
                                      </div>
                                      <div>    svn propedit
                                        svn:externals <a
                                          href="https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk"
                                          target="_blank"
                                          moz-do-not-send="true">https://svnemc.<wbr>ncep.noaa.gov/projects/nems/<wbr>apps/WAM-IPE/trunk</a><br>
                                        <br>
                                      </div>
                                      <div>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.<br>
                                        <br>
                                      </div>
                                      <div>NEMS <a
                                          href="https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/bob"
                                          target="_blank"
                                          moz-do-not-send="true">https://svnemc.ncep.noaa.<wbr>gov/projects/nems/branches/<wbr>WAM-IPE/bob</a><br>
                                        IPELIB  <a
href="https://github.com/IonospherePlasmasphereElectrodynamics/ipe/branches/bob"
                                          target="_blank"
                                          moz-do-not-send="true">https://github.com/<wbr>IonospherePlasmasphereElectrod<wbr>ynamics/ipe/branches/bob</a></div>
                                      <div><br>
                                        4. Check out your branch:<br>
                                      </div>
                                      <br>
                                    </div>
                                        svn co <a
href="https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/branches/bob"
                                      target="_blank"
                                      moz-do-not-send="true">https://svnemc.ncep.noaa.<wbr>gov/projects/nems/apps/WAM-<wbr>IPE/branches/bob</a><br>
                                    <br>
                                  </div>
                                  <div>That will make a directory called
                                    "bob" containing your branch.  <br>
                                  </div>
                                  <div><br>
                                  </div>
                                  5. Apply the diff for each file, using
                                  the "patch" command.<br>
                                  <br>
                                </div>
                                    patch --unified --forward --merge 
                                bob/path/to/file.f
                                old-checkout/path/to/file.f.<wbr>diff<br>
                                <br>
                              </div>
                              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:<br>
                              <br>
                                            &lt;&lt;&lt;&lt;&lt;&lt;&lt;<br>
                                            lines from the original file<br>
                                            |||||||<br>
                                            original lines from the
                              patch<br>
                                            =======<br>
                                            new lines from the patch<br>
                                            &gt;&gt;&gt;&gt;&gt;&gt;&gt;<br>
                              <br>
                            </div>
                            <div>6. Make sure your branch compiles and
                              runs.<br>
                            </div>
                            <div><br>
                            </div>
                            <div>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.<br>
                            </div>
                            <div><br>
                            </div>
                            Sincerely,<br>
                          </div>
                          Sam Trahan</div>
                        <div><br>
                        </div>
                        <div><br>
                        </div>
                        <div>====</div>
                        <div><br>
                        </div>
                      </div>
                      <div><br>
                      </div>
                      <div><br>
                        <div>
                          <div>
                            <div class="h5">
                              <div>On May 23, 2017, at 12:08 PM, Samuel
                                Trahan - NOAA Affiliate &lt;<a
                                  href="mailto:samuel.trahan@noaa.gov"
                                  target="_blank" moz-do-not-send="true">samuel.trahan@noaa.gov</a>&gt;
                                wrote:</div>
                              <br
                                class="m_-2019357589876857985Apple-interchange-newline">
                            </div>
                          </div>
                          <blockquote type="cite">
                            <div>
                              <div class="h5">
                                <div dir="ltr">
                                  <div>
                                    <div>
                                      <div>Naomi,<br>
                                        <br>
                                      </div>
                                      You made the same mistake as Bob. 
                                      You changed the trunk's NEMS and
                                      IPELIB to point to your branches.<br>
                                      <br>
                                    </div>
                                    Sincerely,<br>
                                  </div>
                                  Sam Trahan<br>
                                </div>
                                <div class="gmail_extra"><br>
                                  <div class="gmail_quote">On Tue, May
                                    23, 2017 at 1:28 PM, <span
                                      dir="ltr">&lt;<a
                                        href="mailto:Samuel.Trahan@noaa.gov"
                                        target="_blank"
                                        moz-do-not-send="true">Samuel.Trahan@noaa.gov</a>&gt;</span>
                                    wrote:<br>
                                    <blockquote class="gmail_quote"
                                      style="margin:0 0 0
                                      .8ex;border-left:1px #ccc
                                      solid;padding-left:1ex">Friendly
                                      WAM-IPE developers,<br>
                                      <br>
                                      This is an automated email about a
                                      WAM-IPE commit.<br>
                                      <br>
                                      Project: WAM-IPE<br>
                                      URL: <a
                                        href="https://svnemc.ncep.noaa.gov/projects/nems/apps/WAM-IPE/trunk"
                                        rel="noreferrer" target="_blank"
                                        moz-do-not-send="true">https://svnemc.ncep.noaa.gov/p<wbr>rojects/nems/apps/WAM-IPE/trun<wbr>k</a><br>
                                      Revision: 93143<br>
                                      Author:   <a
                                        href="mailto:naomi.maruyama@noaa.gov"
                                        target="_blank"
                                        moz-do-not-send="true">naomi.maruyama@noaa.gov</a><br>
                                      Date:   
                                       2017-05-23T17:18:30.201346Z<br>
                                      Message:<br>
                                      modified to point my branch to its
                                      externals<br>
                                      <br>
                                      <br>
                                      Differences:<br>
                                      Index: checkout<br>
                                      ==============================<wbr>==============================<wbr>=======<br>
                                      --- checkout    (revision 92991)<br>
                                      +++ checkout    (revision 93143)<br>
                                      <br>
                                      Property changes on: checkout<br>
                                      ______________________________<wbr>______________________________<wbr>_______<br>
                                      Modified: svn:externals<br>
                                      ## -1,7 +1,7 ##<br>
                                      -              NEMS  -r92673 <a
href="https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/quasitrunk"
                                        rel="noreferrer" target="_blank"
                                        moz-do-not-send="true">https://svnemc.ncep.noaa.gov/p<wbr>rojects/nems/branches/WAM-IPE/<wbr>quasitrunk</a><br>
                                      +              NEMS  -r92673 <a
                                        href="https://svnemc.ncep.noaa.gov/projects/nems/branches/WAM-IPE/naomi"
                                        rel="noreferrer" target="_blank"
                                        moz-do-not-send="true">https://svnemc.ncep.noaa.gov/p<wbr>rojects/nems/branches/WAM-IPE/<wbr>naomi</a><br>
                                       NEMS/src/atmos/gsm  -r90126 <a
href="https://svnemc.ncep.noaa.gov/projects/gsm/branches/WAM-IPE/quasitrunk"
                                        rel="noreferrer" target="_blank"
                                        moz-do-not-send="true">https://svnemc.ncep.noaa.gov/p<wbr>rojects/gsm/branches/WAM-IPE/q<wbr>uasitrunk</a><br>
                                       NEMS/src/atmos/nmm  -r85687 <a
                                        href="https://svnemc.ncep.noaa.gov/projects/nems/external_comps/NMM"
                                        rel="noreferrer" target="_blank"
                                        moz-do-not-send="true">https://svnemc.ncep.noaa.gov/p<wbr>rojects/nems/external_comps/NM<wbr>M</a><br>
                                      -            IPELIB          <a
href="https://github.com/IonospherePlasmasphereElectrodynamics/ipe/branches/bob"
                                        rel="noreferrer" target="_blank"
                                        moz-do-not-send="true">https://github.com/IonosphereP<wbr>lasmasphereElectrodynamics/<wbr>ipe/branches/bob</a><br>
                                      +            IPELIB          <a
href="https://github.com/IonospherePlasmasphereElectrodynamics/ipe/branches/naomi"
                                        rel="noreferrer" target="_blank"
                                        moz-do-not-send="true">https://github.com/IonosphereP<wbr>lasmasphereElectrodynamics/<wbr>ipe/branches/naomi</a><br>
                                                      IPE  -r85943 <a
                                        href="https://svnemc.ncep.noaa.gov/projects/ipe/branches/nuopc_cap"
                                        rel="noreferrer" target="_blank"
                                        moz-do-not-send="true">https://svnemc.ncep.noaa.gov/p<wbr>rojects/ipe/branches/nuopc_cap</a><br>
                                                  DATAWAM  -r73436 <a
href="https://svnemc.ncep.noaa.gov/projects/nems/external_comps/DATAWAM/trunk"
                                        rel="noreferrer" target="_blank"
                                        moz-do-not-send="true">https://svnemc.ncep.noaa.gov/p<wbr>rojects/nems/external_comps/DA<wbr>TAWAM/trunk</a><br>
                                                  DATAIPE  -r65981 <a
href="https://svnemc.ncep.noaa.gov/projects/nems/external_comps/DATAIPE/trunk"
                                        rel="noreferrer" target="_blank"
                                        moz-do-not-send="true">https://svnemc.ncep.noaa.gov/p<wbr>rojects/nems/external_comps/DA<wbr>TAIPE/trunk</a><br>
                                    </blockquote>
                                  </div>
                                  <br>
                                </div>
                              </div>
                            </div>
                            ______________________________<wbr>_________________<br>
                            WAM-IPE mailing list<br>
                            <a
                              href="mailto:WAM-IPE@lstsrv.ncep.noaa.gov"
                              target="_blank" moz-do-not-send="true">WAM-IPE@lstsrv.ncep.noaa.gov</a><br>
                            <a
                              href="https://www.lstsrv.ncep.noaa.gov/mailman/listinfo/wam-ipe"
                              target="_blank" moz-do-not-send="true">https://www.lstsrv.ncep.noaa.<wbr>gov/mailman/listinfo/wam-ipe</a><br>
                          </blockquote>
                        </div>
                        <br>
                      </div>
                    </div>
                  </blockquote>
                </div>
                <br>
              </div>
            </blockquote>
          </div>
          <br>
        </div>
      </div>
    </blockquote>
    <br>
    <pre class="moz-signature" cols="72">-- 
--------------------------------------
Naomi Maruyama
CIRES, Univ. of Colorado at Boulder
NOAA Space Weather Prediction Center
phone: +1 303-497-4857
email: <a class="moz-txt-link-abbreviated" href="mailto:naomi.maruyama@noaa.gov">naomi.maruyama@noaa.gov</a>
</pre>
  </body>
</html>