Sorry - perhaps the instructions should have been: git checkout master git branch -D next git fetch git checkout next Satish On Thu, 2 Oct 2014, Barry Smith wrote:

Why does it say "Already up-to-date.� ? It�s like those things are already in next? Why isn�t it putting a bunch of stuff into next? Confusing

Barry

~/Src/petsc next $ git checkout master Switched to branch 'master' Your branch is behind 'origin/master' by 3 commits, and can be fast-forwarded. (use "git pull" to update your local branch) ~/Src/petsc master $ git branch -D next Deleted branch next (was 5fad734). ~/Src/petsc master $ git checkout next Branch next set up to track remote branch next from origin. Switched to a new branch 'next' ~/Src/petsc next $ git pull From bitbucket.org:petsc/petsc + 5fad734...6e2aac5 next -> origin/next (forced update) * [new branch] next-oct-2014 -> origin/next-oct-2014 Already up-to-date! Merge made by the 'recursive' strategy. ~/Src/petsc next $ git merge barry/cleanup-blaslapack Already up-to-date. ~/Src/petsc next $ git merge barry/remove-dreal Already up-to-date. ~/Src/petsc next $ git merge barry/remove-sidl Already up-to-date. ~/Src/petsc next $ git merge barry/reuse-hwloc Already up-to-date. ~/Src/petsc next $ git push Counting objects: 1, done. Writing objects: 100% (1/1), 248 bytes | 0 bytes/s, done. Total 1 (delta 0), reused 0 (delta 0) To [email protected]:petsc/petsc.git 6e2aac5..8c34c3a next -> next

On Oct 2, 2014, at 8:16 AM, Satish Balay <[email protected]> wrote:

...

petsc git users,

If you are using next branch from git repository for integration or testing or working with it in some form - i.e if you have 'next' listed by:

git branch

Please delete and recreate it. i.e:

git checkout master git branch -D next git checkout next

From my check - the following feature branches are currently in next (not yet merged to master).

Feature branch owners, please remerge your feature branches into to next - as you see fit.

$ comm -12 <(git branch -r --merged next | sort) <(git branch -r --no-merged master | sort) origin/barry/cleanup-blaslapack origin/barry/remove-dreal origin/barry/remove-sidl origin/barry/reuse-hwloc origin/dmeiser/pullrequest-fix-cusp-bjacobi2 origin/dmeiser/pullrequest-remove-thrust-py origin/jed/sr-driver4 origin/jed/vecghostgetvalues origin/karlrupp/fix-viennacl-veccopy origin/karpeev/fix-ksp-pcgasm origin/knepley/feature-optcontrol-mg origin/knepley/feature-plex-generator-args origin/knepley/feature-plex-nasm origin/knepley/fix-configure-petsc-dep origin/knepley/fix-quadrature-order origin/madams/sr-driver4 origin/maint origin/mlange05/fix-gmsh-coordinates origin/next origin/paulmullowney/aijcusp-ellpack-fix origin/prbrune/sf-examplefix origin/prbrune/snes-ex19vtkoutput origin/sarich/fix-tao-jbearing-bqpip origin/shri/ts-dae-semi-explicit origin/shri/ts-is-for-differential-variables origin/shri/ts-powergrid origin/stefano_zampini/matis-preallocation origin/stefano_zampini/pcbddc-changeofbasis origin/stefano_zampini/pcbddc_deluxe origin/tisaac/feature-fe-geom-dim origin/tisaac/plex-flexible-projection

[obviously remove maint, next from the above list]

The previous 'next' branch is currently available as 'next-oct-2014' - if you need it for any checks/debugging.

Satish