[petsc-dev] failed rebase

[Satish Balay]

My OS build also went through. Looks like you haven't pushed [force update] this branch - so I'm testing with something totally different.

So likely something in your rebased sources is causing bfort to fail..

Satish

On Thu, 2 Apr 2020, Mark Adams wrote:

> I see:
> 22:46 128 mark/feature-xgc-interface-rebase<> ~/Codes/petsc$ git status
> On branch mark/feature-xgc-interface-rebase
> Your branch and 'origin/mark/feature-xgc-interface-rebase' have diverged,
> and have 130 and 18 different commits each, respectively.
>   (use "git pull" to merge the remote branch into yours)
> 
> Untracked files:
>   (use "git add <file>..." to include in what will be committed)
>         out2.txt
>         src/dm/impls/plex/examples/tutorials/Landau/
> 
> 
> On Thu, Apr 2, 2020 at 10:45 PM Mark Adams <mfadams at lbl.gov> wrote:
> 
> >
> >
> > On Thu, Apr 2, 2020 at 10:33 PM Satish Balay <balay at mcs.anl.gov> wrote:
> >
> >> Is this branch mark/feature-xgc-interface-rebase pushed?
> >
> >
> > yes.
> >
> >
> >> I had done a build with the current state of it - and the build went
> >> through fine. This was on linux.
> >>
> >> Will try OSX now.
> >>
> >> Satish
> >>
> >> On Thu, 2 Apr 2020, Mark Adams wrote:
> >>
> >> > Note, when I rebased I got one conflict, in a header where I added
> >> stuff at
> >> > the end and master did also so I just kept them both and continued.
> >> > Other than that it was a clean rebase.
> >> >
> >> > On Thu, Apr 2, 2020 at 10:15 PM Mark Adams <mfadams at lbl.gov> wrote:
> >> >
> >> > >
> >> > >
> >> > > On Thu, Apr 2, 2020 at 9:32 PM Satish Balay <balay at mcs.anl.gov>
> >> wrote:
> >> > >
> >> > >> can you try this in a local clone [same branch] and see if that
> >> works?
> >> > >>
> >> > >> cd /Users/markadams/Codes
> >> > >> git clone petsc petsc-test
> >> > >> cd petsc-test
> >> > >> ./configure ...
> >> > >>
> >> > >> Satish
> >> > >>
> >> > >>
> >> > >> On Thu, 2 Apr 2020, Mark Adams wrote:
> >> > >>
> >> > >> > I tried to rebase mark/feature-xgc-interface-rebase with master
> >> and I
> >> > >> get
> >> > >> > this.
> >> > >> > I of course deleted the arch directory.
> >> > >> > Thanks,
> >> > >> > Mark
> >> > >> >
> >> > >>
> >> > >>
> >> >
> >>
> >>
>