Initial add of defaria.com
[clearscm.git] / defaria.com / blogs / Status / archives / 000108.html
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" id="sixapart-standard">
4 <head>
5    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6    <meta name="generator" content="Movable Type 5.2.3" />
7
8    <link rel="stylesheet" href="http://defaria.com/blogs/Status/styles-site.css" type="text/css" />
9    <link rel="alternate" type="application/atom+xml" title="Atom" href="http://defaria.com/blogs/Status/atom.xml" />
10    <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="http://defaria.com/blogs/Status/index.xml" />
11
12    <title>Status for Andrew DeFaria: FX merge/build, onu2360</title>
13
14    <link rel="start" href="http://defaria.com/blogs/Status/" title="Home" />
15    <link rel="prev" href="http://defaria.com/blogs/Status/archives/000106.html" title="Merging 2.3 -&gt; FX" />
16    <link rel="next" href="http://defaria.com/blogs/Status/archives/000109.html" title="2.3.0.1" />
17
18    
19
20    
21
22    <script type="text/javascript" src="http://defaria.com/blogs/Status/mt-site.js"></script>
23 </head>
24 <body class="layout-one-column" onload="individualArchivesOnLoad(commenter_name)">
25    <div id="container">
26       <div id="container-inner" class="pkg">
27
28          <div id="banner">
29             <div id="banner-inner" class="pkg">
30                <h1 id="banner-header"><a href="http://defaria.com/blogs/Status/" accesskey="1">Status for Andrew DeFaria</a></h1>
31                <h2 id="banner-description">Searchable status reports and work log</h2>
32             </div>
33          </div>
34
35          <div id="pagebody">
36             <div id="pagebody-inner" class="pkg">
37                <div id="alpha">
38                   <div id="alpha-inner" class="pkg">
39
40                      <p class="content-nav">
41                         <a href="http://defaria.com/blogs/Status/archives/000106.html">&laquo; Merging 2.3 -> FX</a> |
42                         <a href="http://defaria.com/blogs/Status/">Main</a>
43                         | <a href="http://defaria.com/blogs/Status/archives/000109.html">2.3.0.1 &raquo;</a>
44                      </p>
45
46                      <a id="a000108"></a>
47                      <div class="entry" id="entry-108">
48                         <h3 class="entry-header">FX merge/build, onu2360</h3>
49                         <div class="entry-content">
50                            <div class="entry-body">
51                               <ul>
52
53 <p><li>Continuing on with merge/build of US_FX branch. Seems this is impedding further development. There were 2 files that required manual merging. I was told to simply copy r_ingress.asmi from 2.3. I'm not particularly comfortable with that because there are merge issues for that file from the 2.2 branch.</li></p>
54
55 <p><li>Tried to figure out why 2.4 was not building onu2360. Seems that onu2360 was not included in the cards script (in /Tools/adm/etc) so the build process was not building it. Added it to cards</li></p>
56
57 </ul>
58                            </div>
59                            <div id="more" class="entry-more">
60                               
61                            </div>
62                         </div>
63                         <p class="entry-footer">
64                            <span class="post-footers">Posted by  on January 23, 2004  2:32 PM</span> <span class="separator">|</span> <a class="permalink" href="http://defaria.com/blogs/Status/archives/000108.html">Permalink</a>
65                         </p>
66                      </div>
67
68                      
69
70                      
71                   </div>
72                </div>
73             </div>
74          </div>
75       </div>
76    </div>
77 </body>
78 </html>