<div class="gmail_extra"><br><br><div class="gmail_quote">On Sat, Nov 17, 2012 at 11:19 AM, Satish Balay <span dir="ltr"><<a href="mailto:balay@mcs.anl.gov" target="_blank">balay@mcs.anl.gov</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div id=":1p3">I guess it could b:<br>
<br>
- I make changes to petsc-release/buildsystem, commit </div></blockquote><div><br></div><div>This create a new head in petsc-release/buildsystem (but not in petsc-release).</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div id=":1p3">push petsc-release<br>
 [error with buildsystem push - so merge with petsc-release, push]<br>
<br>
- Barry makes changes to petsc-release/buildsystem, commit push petsc-release.<br>
  Error with petsc-release push - so, pull, merge petsc-release. This will<br>
  also pull,merge corresponding buildsystem. now commit and push petsc-release.<br>
 [error with buildsystem push - so merge with petsc-release, push]<br></div></blockquote><div><br></div><div>Right, go to petsc-dev, pull petsc-release, merge (applies to both petsc-dev and petsc-dev/buildsystem), and push.</div>
<div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div id=":1p3">
<br>
BTW: from <a href="http://mercurial.selenic.com/wiki/Subrepository" target="_blank">http://mercurial.selenic.com/wiki/Subrepository</a><br>
<br>
* There's no support for merging across renaming/moving subrepos *<br>
<br>
So changing 'BuildSystem -> 'buildsystem' will cause grief with subrepos?</div></blockquote></div><br></div><div class="gmail_extra">I think we should do the rename first.</div>