[petsc-dev] migrating repos from petsc.cs.iit.edu to bitbucket.org
Jed Brown
jedbrown at mcs.anl.gov
Sat Nov 17 10:26:38 CST 2012
On Sat, Nov 17, 2012 at 11:19 AM, Satish Balay <balay at mcs.anl.gov> wrote:
> I guess it could b:
>
> - I make changes to petsc-release/buildsystem, commit
>
This create a new head in petsc-release/buildsystem (but not in
petsc-release).
> push petsc-release
> [error with buildsystem push - so merge with petsc-release, push]
>
> - Barry makes changes to petsc-release/buildsystem, commit push
> petsc-release.
> Error with petsc-release push - so, pull, merge petsc-release. This will
> also pull,merge corresponding buildsystem. now commit and push
> petsc-release.
> [error with buildsystem push - so merge with petsc-release, push]
>
Right, go to petsc-dev, pull petsc-release, merge (applies to both
petsc-dev and petsc-dev/buildsystem), and push.
>
> BTW: from http://mercurial.selenic.com/wiki/Subrepository
>
> * There's no support for merging across renaming/moving subrepos *
>
> So changing 'BuildSystem -> 'buildsystem' will cause grief with subrepos?
>
I think we should do the rename first.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20121117/263182b2/attachment.html>
More information about the petsc-dev
mailing list