defaria.com/blogs/Status/archives/000489.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: Cleardiffmrg/bin_merge problems</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/000488.html" title="Code Page/create_dev_snapview.pl" />
  16    <link rel="next" href="http://defaria.com/blogs/Status/archives/000491.html" title="Stripmime/Cleardiffmrg/CharacterSetValidation" />
  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/000488.html">&laquo; Code Page/create_dev_snapview.pl</a> |
  42                         <a href="http://defaria.com/blogs/Status/">Main</a>
  43                         | <a href="http://defaria.com/blogs/Status/archives/000491.html">Stripmime/Cleardiffmrg/CharacterSetValidation &raquo;</a>
  44                      </p>
  45
  46                      <a id="a000489"></a>
  47                      <div class="entry" id="entry-489">
  48                         <h3 class="entry-header">Cleardiffmrg/bin_merge problems</h3>
  49                         <div class="entry-content">
  50                            <div class="entry-body">
  51                               <ul>
  52   <li>Told Andrew about new -reuse_stream option to create_dev_snapview.pl. I have him testing this</li>
  53
  54   <li>Worked with Shivdutt and IBM/Rational on problem with cleardiffmrg. I think I've worked this out to the leading "/" that UCMCustom users.</li>
  55
  56   <li>Finished stripmime - Ray testing it - created stripmimed that logs to /tmp.</li>
  57
  58   <li>Worked at getting bin_merge integrated into UCMCustom.pl</li>
  59
  60   <li>Implemented quick script (topper) to try to catch the hanging problem with ccase-rmna-3</li>
  61 </ul>
  62                            </div>
  63                            <div id="more" class="entry-more">
  64                               <h2>Cleardiffmgr problem</h2>
  65
  66 <p>The problem occurs during a deliver between projects where there is a merge conflict and UCMCustom wants to have findmerge call up a Cleardiffmgr to resolve the conflicts. I've seen this before WRT snapshot views and view tags with forward slashes at Ameriquest. UCMCustom perfaces' the vob tags with "/".</p>
  67
  68 <p>But this problem doesn't always happen - in fact most of the time it appears to work. It might be just when there's a merge conflict</p>
  69
  70 <p>After working with Shivdutt and IBM/Rational on the problem and getting down to reproducing it with a long cleartool findmerge command in the user's environment this problem started happening to me in my test environment as I was integrating bin_merge. After much narrowing down I found:</p>
  71
  72 <p>Here's some more information. As you know I started having a similar problem as the end user. I paired it down to the following. This fails (but does not always fail):</p>
  73
  74 <div class="code"><pre>
  75     Z:\andys_pvob>cleartool findmerge /andy\bin\cygwin_setup -fver \main\Andrew_Integration\6 -log NUL -gmerge -nc
  76     Needs Merge "/andy\bin\cygwin_setup" [to \main\Andrew_Integration\Andrew2_Integration\CHECKEDOUT from \main\Andrew_Integration\6 base \main\Andrew_Integration\5]
  77 </pre></div>
  78
  79 <p>However the following does work:</p>
  80
  81 <div class="code"><pre>
  82     Z:\andys_pvob>cleartool findmerge \andy\bin\cygwin_setup -fver \main\Andrew_Integration\6 -log NUL -gmerge -nc
  83     Needs Merge "\andy\bin\cygwin_setup" [to \main\Andrew_Integration\Andrew2_Integration\CHECKEDOUT from \main\Andrew_Integration\6 base \main\Andrew_Integration\5]
  84 </pre></div>
  85
  86 <p>Notice the difference? It's subtle. The first findmerge's path starts with a "/" while the second one starts with a "\".</p>
  87
  88 <h2>bin_merge integration</h2>
  89
  90 <p>My bin_merge script remains it's own process. This will be useful if others wish to use this process. However UCMCustom needs to incorporate calling bin_merge. I'm currently having a problem with this because I want to start bin_merge as a pipe so I can give the user feedback. But bin_merge runs to completion before the first output is received. I don't know why this is happening as it doesn't happen in a smaller test.pl environment, only under the massive UCMCustom.pl...</p>
  91                            </div>
  92                         </div>
  93                         <p class="entry-footer">
  94                            <span class="post-footers">Posted by  on December  5, 2005  7:54 PM</span> <span class="separator">|</span> <a class="permalink" href="http://defaria.com/blogs/Status/archives/000489.html">Permalink</a>
  95                         </p>
  96                      </div>
  97
  98
  99
 100
 101                   </div>
 102                </div>
 103             </div>
 104          </div>
 105       </div>
 106    </div>
 107 </body>
 108 </html>