<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Jul 17, 2014 at 10:24 AM, Frank Loeffler <span dir="ltr"><<a href="mailto:knarf@cct.lsu.edu" target="_blank">knarf@cct.lsu.edu</a>></span> wrote:<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div class="">
> * Some of the commits creating tags also introduce changes to the tree<br>
> (files). These commits were automatically created by the cvs2svn script.<br>
<br>
</div>Why is that a problem? Does the conversion choke if commits do multiple<br>
things at once?<br></blockquote><div><br></div><div>The problem is that tags are not commits, they are supposed to be permanent pointers to a specific commit. They are never supposed to change and they cannot introduce changes to the tree. This is conceptually the same in svn, but not strictly enforced (since tags are really just copies of the code at another point in the svn directory tree).</div>
<div><br></div><div>The problem happens when multiple thorns each have tags which also contain changes to the tree. A tag is just a pointer to a commit and can't point to two different commits at the same time.</div>
<div>
<br></div><div>The solution I've used in instances where this happens is to create a new branch and merge all of the commits into that branch.</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div class="">
> * Some branches/tags (e.g. STABLE, LATEST) were not created at the same<br>
> time across different repositories. None of the ones that I encountered had<br>
> what I would useful content (e.g. having a STABLE tag pointing to some<br>
> point long in the past is not particularly useful).<br>
<br>
</div>I agree. We would very likely be better off without them.<br></blockquote><div><br></div><div>That makes things easier. I have a full list of tags/branches that have been omitted from the merged repositories so that we're sure we're not missing something. Right now that list is (not all of these are present in all arrangements/thorns):</div>
<div><br></div><div>Branches:</div><div>start</div><div>El-Kharma<br></div><div>dp<br></div><div><br></div><div>Tags:</div><div>LATEST</div><div>STABLE</div><div>v1</div><div>v_1</div><div>r1</div><div>V1</div><div>JTHORN_INIT</div>
<div>JT_2002_08_18</div><div>jthorn_20050318</div><div>gr_qc</div><div>LOCALINTERP_INIT</div><div>Rel-0-1<br></div><div><br></div><div>I have now finished converting all of the repositories listed in the Version Control page of the wiki <<a href="https://docs.einsteintoolkit.org/et-docs/Version_control">https://docs.einsteintoolkit.org/et-docs/Version_control</a>>. The results are available at:</div>
<div><a href="https://bitbucket.org/barrywardell/cactustest">https://bitbucket.org/barrywardell/cactustest</a><br></div><div><a href="https://bitbucket.org/barrywardell/cactuspugh">https://bitbucket.org/barrywardell/cactuspugh</a><br>
</div><div><a href="https://bitbucket.org/barrywardell/cactusnumerical">https://bitbucket.org/barrywardell/cactusnumerical</a><br></div><div><a href="https://bitbucket.org/barrywardell/pittnullcode">https://bitbucket.org/barrywardell/pittnullcode</a><br>
</div><div><a href="https://bitbucket.org/barrywardell/cactusbase">https://bitbucket.org/barrywardell/cactusbase</a><br></div><div><br></div><div>A couple of minor things came up in the conversion process:</div><div><br>
</div>
<div>* I created a merged CactusNumerical as a more difficult test than CactusBase before noticing that it wasn't listed on the wiki page. It may be that we don't need this arrangement merged.</div><div>* I included both CactusPUGH and CactusPUGHIO thorns (IOHDF5 and IOHDF5Util) in the same arrangement. It may be that they should be kept separate.</div>
<div><br></div><div>Barry<br></div></div></div></div>