[petsc-dev] Fwd: [petsc-maint #119133] petsc-dev configure crash
Jed Brown
jedbrown at mcs.anl.gov
Thu Jun 7 11:40:52 CDT 2012
On Thu, Jun 7, 2012 at 1:28 AM, Satish Balay <balay at mcs.anl.gov> wrote:
> ok - rebase behaves differently with subrepos. How is it supporsed to work?
>
> With separate repos - I can do:
>
> hg commit [local changes]
> hg pull --rebase [automatically rebases the commit
> hg push
>
The rebase is not applied recursively in subrepos. Compare what we have now:
remember to go into config/BuildSystem, pull, merge or rebase, and push
to how it works with sebrepos:
If you naively pull, but there is a subrepo conflict, it will error. That
tells you that you have to go into config/BuildSystem, pull, and merge.
Once you do that and commit to petsc, BuildSystem will automatically be
carried along on subsequent pushes, etc.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20120607/3a2b2586/attachment.html>
More information about the petsc-dev
mailing list