On Tue, Mar 19, 2013 at 10:44 AM, Satish Balay <balay at mcs.anl.gov> wrote:
> > There is a new version of PTScotch. I tried configuring with > --download-ptscotch= > https://gforge.inria.fr/frs/download.php/31832/scotch_6.0.0_esmumps.tar.gz > > > > It works on Linux with the patch below (note the missing whitespace > should have been fixed in 3.3). > > Hm - so this part of the patch should go into 'maint' tree - and then > merged into 'next/master'? So we need 2 branches for applying this patch? > one that goes into 'maint' & 'next/master' - the other that goes into > 'next/master'? > No, we would apply the patch in 'maint' and merge the branch directly to 'next'. Later, we merge the same branch into 'maint'. > > [Will let the git experts comment on the workflow to use'] > > I dont' unserstand the 'maint' branch. It has merges from 3.3 - so I > don't know if its eqivalent to petsc-3.3+bs-3.3 or not. [ andI'm not > sure if we'll have another patch update to 3.3] It does not have merges from 3.3. It does have a merge from 3.2 because I applied .gitignore and the buildsystem import back to 3.2. -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20130319/3b3a98c9/attachment-0001.html>
