[petsc-users] [petsc-dev] petsc git next branch *is* unwound!

[Nystrom, William David]

What is meant by the phrase "petsc git next branch is unwound"?  What git
commands are run to do this?  And how is the next branch different when
it is unwound from immediately before it is unwound?

Thanks,

Dave

--
Dave Nystrom
LANL HPC-5
Phone: 505-667-7913
Email: wdn at lanl.gov
Smail: Mail Stop B272
       Group HPC-5
       Los Alamos National Laboratory
       Los Alamos, NM 87545


________________________________________
From: Nystrom, William David
Sent: Thursday, October 02, 2014 10:57 AM
To: petsc-users; petsc-dev at mcs.anl.gov
Cc: Nystrom, William David
Subject: RE: [petsc-dev] [petsc-users] petsc git next branch *is* unwound!

On my local machine I have my master, bare git repo with the following config file
which Jed suggested a year or so ago:

% cat config
[core]
        repositoryformatversion = 0
        filemode = true
        bare = true
        sharedrepository = 1
[receive]
        denyNonFastforwards = true
[remote "origin"]
        url = https://bitbucket.org/petsc/petsc
        fetch = +refs/heads/maint:refs/heads/maint
        fetch = +refs/heads/master:refs/heads/master
        fetch = +refs/heads/next:refs/heads/next
[remote "artab"]
        url = ssh://ml-fey.lanl.gov/usr/projects/artab/users/wdn/repos/git/petsc
        fetch = +refs/*:refs/*
        mirror = true

And for my workflow, I stay in sync with the official PETSc git repo by periodically
executing the following command:

git remote -v update origin

And then I have various git clones from my master git repo where I do actual
work.

Do I need to do anything special now that the "next" branch has been unwound
with either my master git repo or my git clones?  In my master git repo, I have
3 additional branches - wdn_mods_next, wdn_mods_master and wdn_mods_maint
where I keep any of my own modifications to those respective branches.  And I
keep wdn_mods_next in sync with next by periodically executing the following
commands in a git clone with the wdn_mods_next branch checked out:

git pull origin next

resolve any conflicts and commit

git push origin wdn_mods_next:wdn_mods_next

So, if I do the following set of steps, should I expect them to work now that next
has been unwound?

1. cd to my master bare petsc repo
    git remote -v update origin

2. cd to my git clone of petsc with wdn_mods_next branch checked out
    git pull origin next
    resolve any conflicts and commit
    git push origin wdn_mods_next:wdn_mods_next

Thanks,

Dave

--
Dave Nystrom
LANL HPC-5
Phone: 505-667-7913
Email: wdn at lanl.gov
Smail: Mail Stop B272
       Group HPC-5
       Los Alamos National Laboratory
       Los Alamos, NM 87545


________________________________________
From: petsc-dev-bounces at mcs.anl.gov [petsc-dev-bounces at mcs.anl.gov] on behalf of Satish Balay [balay at mcs.anl.gov]
Sent: Thursday, October 02, 2014 7:38 AM
To: petsc-dev at mcs.anl.gov; petsc-users at mcs.anl.gov
Subject: Re: [petsc-dev] [petsc-users] petsc git next branch *is* unwound!

On Thu, 2 Oct 2014, Satish Balay 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.

BTW: Some of you might want to rebase/cleanup some of the feature branches
before merging to new next.

Also some of these feature branches are from pre-petsc-3.5 timeframe.
So a rebase to latest master might be something to consider. [if they
are still in line for a merge to master]

Satish

>
> $ 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
>
>
>
>