[petsc-dev] *unwind* next branch

All (next users), ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2017-September/021361.html I've recreated 'next' branch - and have a backup for current 'next' at 'origin/next-mar-2019'. [Note: this backup is from Mar 21. Subsequently next was used as a rewrite-able branch] So if you have/

[petsc-dev] *unwind* next branch

All (next users), ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2018-April/022747.html I've recreated 'next' branch - and have a backup for current 'next' at 'next-sep-2018'. So if you have/use 'next' branch in your clone - please do the following (in all your git clones): git checkout m

[petsc-dev] *unwind* next branch

All (next users), Next is unwound so please reset your next branch before pushing to it. [Its currently has some rebased/modified commits that's preventing merges - and can potentially invalidate tests] Old next is saved at next-jun-2018 Current branches that need to be re-merged to next: ori

[petsc-dev] *unwind* next branch [again]

All (next users), Next is unwound again so please reset your next before pushing to it. [this is the easiest way to remove branches from next] Old next is saved at next-apr-2018-2 Satish --- Ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2018-April/022747.html So if you have/u

[petsc-dev] *unwind* next branch

All (next users), ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2017-September/021361.html I've recreated 'next' branch - and have a backup for current 'next' at 'next-apr-2018'. So if you have/use 'next' branch in your clone - please do the following (in all your git clones): git checko

Re: [petsc-dev] *unwind* next branch

On Tue, 14 Nov 2017, Adrian Croucher wrote: > > Petsc 'next' branch users, > > > > I've recreated 'next' branch - and have a backup for current 'next' at > > next-nov-2017 > > > > [This is eliminate some binary files - that got inadvertently > > added. next-nov-2017 will be deleted at a later ti

Re: [petsc-dev] *unwind* next branch

Petsc 'next' branch users, I've recreated 'next' branch - and have a backup for current 'next' at next-nov-2017 [This is eliminate some binary files - that got inadvertently added. next-nov-2017 will be deleted at a later time] So (next branch users) please do the following (in all your git cl

[petsc-dev] *unwind* next branch

Petsc 'next' branch users, I've recreated 'next' branch - and have a backup for current 'next' at next-nov-2017 [This is eliminate some binary files - that got inadvertently added. next-nov-2017 will be deleted at a later time] So (next branch users) please do the following (in all your git clo

Re: [petsc-dev] *unwind* next branch

Next is recreated (again) so these branches are no longer there. Satish On Wed, 2017-09-27 at 16:17 +0300, Lisandro Dalcin wrote: > Also revert the merge of dalcinl/fix-dmplex-draw, I have to decline > the PR and make a new one targeting maint. > > On 27 September 2017 at 16:16, Lisandro Dalcin

Re: [petsc-dev] *unwind* next branch

All (next users), We had to unwind next again - so you would also have to do the delete and recreate next again! Sorry about that. If you try to merge across the old and new next versions - you should get a merge conflict on include/petscversion.h. [i.e this merge conflict indicates you have to

Re: [petsc-dev] *unwind* next branch

Lisandro Dalcin writes: >> Jed suggests - updates can go into 3.8.1 - if there are 'no >> incompatible interface changes' [but thats harder for me to verify for >> non-bugfix changes] >> > > This suggestion truly means that we can ADD public functions and > #defines to maint ? Yeah, we've done t

Re: [petsc-dev] *unwind* next branch

On 27 September 2017 at 16:18, Satish Balay wrote: >>> > commit 8e80f76617739c84d1b952f9d3f7b8e359e84079 > Merge: b5178cece8 5fbebc36b8 > Author: Lisandro Dalcin > Date: Tue Sep 26 12:36:39 2017 > > Merge branch 'dalcinl/add-tsrestart' into next > < > > Well I was looking for branch

Re: [petsc-dev] *unwind* next branch

>> commit 8e80f76617739c84d1b952f9d3f7b8e359e84079 Merge: b5178cece8 5fbebc36b8 Author: Lisandro Dalcin Date: Tue Sep 26 12:36:39 2017 Merge branch 'dalcinl/add-tsrestart' into next < Well I was looking for branches that were already tested in next. [i.e branches that get merged so

Re: [petsc-dev] *unwind* next branch

Also revert the merge of dalcinl/fix-dmplex-draw, I have to decline the PR and make a new one targeting maint. On 27 September 2017 at 16:16, Lisandro Dalcin wrote: > Satish, please revert the merge to next of my branch > dalcinl/add-tsrestart. This branch has fixes that should go to new > maint,

Re: [petsc-dev] *unwind* next branch

Satish, please revert the merge to next of my branch dalcinl/add-tsrestart. This branch has fixes that should go to new maint, but now I need to rework the commits, as they introduce new APIs. On 27 September 2017 at 11:02, Lisandro Dalcin wrote: > I had a branch (PR 755) merged into next BEFORE

Re: [petsc-dev] *unwind* next branch

I had a branch (PR 755) merged into next BEFORE (by looking at the commit list in Bitbucket) the commits related to the release were pushed. So this PR did not make in for the new release. On 27 September 2017 at 05:01, Balay, Satish wrote: > ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/201

[petsc-dev] *unwind* next branch

ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2016-April/019013.html I've recreated 'next' branch - and have a backup for current 'next' at 'next-sep-2017'. So *all git repo users* (if you have/use 'next' branch in your clone) - please do the following (in all your git clones): git checkout

[petsc-dev] *unwind* next branch

ref http://lists.mcs.anl.gov/pipermail/petsc-dev/2016-April/019013.html We are having to unwind 'next' branch as we fear that some commits in this branch are harder to track. I've recreated 'next' branch - and have a backup for current 'next' at 'next-may-2016'. So *all git repo users* (if you h

[petsc-dev] *unwind* next branch

ref: http://lists.mcs.anl.gov/pipermail/petsc-dev/2015-June/017804.html I've recreated 'next' branch - and have a backup for current 'next' at 'next-apr-2016'. So *all git repo users* (if you have/use 'next' branch in your clone) - please do the following (in all your git clones): git checkout

Re: [petsc-dev] *unwind* next branch

On Tue, Jun 9, 2015 at 6:06 PM Barry Smith wrote: > > > On Jun 9, 2015, at 5:48 PM, Satish Balay wrote: > > > > I've recreated 'next' branch - and have a backup for current 'next' at > > ' > > The following branches need to be remerged to next. > >Preferably AFTER they have been fixed to act

Re: [petsc-dev] *unwind* next branch

> On Jun 9, 2015, at 6:12 PM, Jed Brown wrote: > > Barry Smith writes: > >>> On Jun 9, 2015, at 5:48 PM, Satish Balay wrote: >>> >>> I've recreated 'next' branch - and have a backup for current 'next' at >>> ' >>> The following branches need to be remerged to next. >> >> Preferably AFTER

Re: [petsc-dev] *unwind* next branch

Barry Smith writes: >> On Jun 9, 2015, at 5:48 PM, Satish Balay wrote: >> >> I've recreated 'next' branch - and have a backup for current 'next' at >> ' >> The following branches need to be remerged to next. > >Preferably AFTER they have been fixed to actually build cleaning with no > erro

Re: [petsc-dev] *unwind* next branch

> On Jun 9, 2015, at 5:48 PM, Satish Balay wrote: > > I've recreated 'next' branch - and have a backup for current 'next' at > ' > The following branches need to be remerged to next. Preferably AFTER they have been fixed to actually build cleaning with no errors/warnings on next including w

[petsc-dev] *unwind* next branch

I've recreated 'next' branch - and have a backup for current 'next' at 'next-jun-2015'. So *all git repo users* (if you have/use 'next' branch in your clone) - please do the following (in all your git clones): git checkout master git fetch git branch -D next git checkout next Please *do not push

Re: [petsc-dev] unwind next branch

On Fri, 12 Sep 2014, Mark Adams wrote: > You can delete all of my branches (mark or madams), except for two that are > waiting as pull requests: > > mark/fortanenums > > mark/gamg-zerod

Re: [petsc-dev] unwind next branch

You can delete all of my branches (mark or madams), except for two that are waiting as pull requests: mark/fortanenums mark/gamg-zerod On Tue, Sep 9, 2014 at 7:33 PM, Satish Bal

Re: [petsc-dev] unwind next branch

I deleted the following branches at bitbucket: origin/barry/add-snespseudo origin/barry/august-tutorial origin/barry/twitter origin/knepley/dmswarm origin/knepley/sr-driver origin/jose/mumps-bugfix origin/shri/external-package-KLU origin/shri/feature-dm-circuit Also deleted t

Re: [petsc-dev] unwind next branch

e: > You can delete > origin/shri/external-package-KLU > origin/shri/feature-dm-circuit > > > Please keep all the other branches. > > Thanks, > Shri > > -Original Message- > From: satish balay > Date: Tue, 9 Sep 2014 17:50:58 -0500 > To: petsc-d

Re: [petsc-dev] unwind next branch

You can delete origin/shri/external-package-KLU origin/shri/feature-dm-circuit Please keep all the other branches. Thanks, Shri -Original Message- From: satish balay Date: Tue, 9 Sep 2014 17:50:58 -0500 To: petsc-dev mailing list Subject: [petsc-dev] unwind next branch >

Re: [petsc-dev] unwind next branch

Please keep all my branches not yet merged to master 2014-09-10 2:33 GMT+03:00 Satish Balay : > On Tue, 9 Sep 2014, Jed Brown wrote: > > > Satish Balay writes: > > > > > Jed, > > > > > > After 3.5 release we have not unwound next branch. > > > > > > With 3.5.2 out - is it a good time to unwind?

Re: [petsc-dev] unwind next branch

> origin/jose/mumps-bugfix --> remove (those fixes have already been included in other commits by Hong.) Jose

Re: [petsc-dev] unwind next branch

On Tue, Sep 9, 2014 at 6:33 PM, Satish Balay wrote: > On Tue, 9 Sep 2014, Jed Brown wrote: > > > Satish Balay writes: > > > > > Jed, > > > > > > After 3.5 release we have not unwound next branch. > > > > > > With 3.5.2 out - is it a good time to unwind? > > > > > > This might need some coordinat

Re: [petsc-dev] unwind next branch

On Sep 9, 2014, at 6:33 PM, Satish Balay wrote: > On Tue, 9 Sep 2014, Jed Brown wrote: > >> Satish Balay writes: >> > > Also we have quiet a few development branches. Not sure if any > of them are abandoned [and should be purged..]. Perhaps we > should review these branches aswell. > >

Re: [petsc-dev] unwind next branch

On Tue, 9 Sep 2014, Jed Brown wrote: > Satish Balay writes: > > > Jed, > > > > After 3.5 release we have not unwound next branch. > > > > With 3.5.2 out - is it a good time to unwind? > > > > This might need some coordination as there are some old branches that > > are not yet merged to master/n

Re: [petsc-dev] unwind next branch

Satish Balay writes: > Jed, > > After 3.5 release we have not unwound next branch. > > With 3.5.2 out - is it a good time to unwind? > > This might need some coordination as there are some old branches that > are not yet merged to master/next.. (so they need rebase?) I'd rather re-merge than reb

[petsc-dev] unwind next branch

Jed, After 3.5 release we have not unwound next branch. With 3.5.2 out - is it a good time to unwind? This might need some coordination as there are some old branches that are not yet merged to master/next.. (so they need rebase?) balay@asterix /home/balay/petsc (master) $ comm -12 <(git branch