defaria.com/blogs/Status/archives/000037.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: Merging 2.2 -> 2.3 & 2.4</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/000035.html" title="Coordinating merging" />
  16    <link rel="next" href="http://defaria.com/blogs/Status/archives/000039.html" title="2.2.1.3/sam4linux/2.2-&gt;2.3" />
  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/000035.html">&laquo; Coordinating merging</a> |
  42                         <a href="http://defaria.com/blogs/Status/">Main</a>
  43                         | <a href="http://defaria.com/blogs/Status/archives/000039.html">2.2.1.3/sam4linux/2.2->2.3 &raquo;</a>
  44                      </p>
  45
  46                      <a id="a000037"></a>
  47                      <div class="entry" id="entry-37">
  48                         <h3 class="entry-header">Merging 2.2 -> 2.3 & 2.4</h3>
  49                         <div class="entry-content">
  50                            <div class="entry-body">
  51                               <ol>
  52 <li>Added automatic merging for 2.2 -> 2.3 & 2.4</li>
  53 <li>Performed initial 2.2 -> 2.3 merge. Had some problems</li>
  54 <li>Banged my head trying to get Samba 3 to work on sonlinux</li>
  55 <li>Assisted James installing some packages on sonslinux</li>
  56 </li>
  57                            </div>
  58                            <div id="more" class="entry-more">
  59                               <p>Dylan discussed with me that we should be merging fixes forward from 2.2 -> 2.3 and from 2.2 -> 2.4. Eventually we will need to merge 2.2 -> 2.3 -> 2.4 but doing so now might cause problems with the 2.3 -> 2.4 merge. I guess 2.3 is in a little bit of flux right now.
  60
  61 <p>Discussed this with Jeff and he agreed. The merging schedule for this is set to weekly. 2.2 -> 2.3 merging happens on Sunday (at 5:30 Am in Santa Clara and 9:30 Pm (Sunday night) in Shanghai - roughly the same time given the timezone difference). The 2.2 ->2 4 merge happens on Tuesdays @ 5:30 Am Santa Clara and 9:30 Pm Shanghai time.
  62                            </div>
  63                         </div>
  64                         <p class="entry-footer">
  65                            <span class="post-footers">Posted by  on November 19, 2003  6:12 PM</span> <span class="separator">|</span> <a class="permalink" href="http://defaria.com/blogs/Status/archives/000037.html">Permalink</a>
  66                         </p>
  67                      </div>
  68
  69
  70
  71
  72                   </div>
  73                </div>
  74             </div>
  75          </div>
  76       </div>
  77    </div>
  78 </body>
  79 </html>