<div dir="ltr"><div class="gmail_extra">On Mon, May 13, 2013 at 8:48 PM, Jed Brown <span dir="ltr"><<a href="mailto:jedbrown@mcs.anl.gov" target="_blank">jedbrown@mcs.anl.gov</a>></span> wrote:<br><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">== Users ==<br>
<br>
I have rewound the branch 'next' after the release, so it will<br>
not fast-forward (just this once). If you have a local 'next' branch,<br>
you should abandon it and check out a fresh one. You can do this with<br>
<br>
$ git checkout master<br>
$ git branch -D next # delete the old branch<br>
$ git pull<br>
$ git checkout next # revisit 'next' if you want<br>
<br>
If you are tracking 'master', 'git pull' will be sufficient.<br>
<br>
<br>
== Developers ==<br>
<br>
With v3.4 tagged, we can decide what to do with the branches left over<br>
from 'next' (now in a temporary 'next-pre-3.4' that will be deleted).<br>
If they should be rebased, it's best to do it now.<br>
<br>
$ git checkout my/branch<br>
$ git rebase v3.4<br>
$ git push -f --dry-run # should show force-update to your branch only, then remove '--dry-run'<br>
<br>
If you like everything in the branch, but there are conflicts, you can<br>
sync with v3.4 now [1].<br>
<br>
$ git checkout my/branch<br>
$ git merge v3.4<br>
$ git push<br>
<br>
<br>
Here is a status summary for the branches that used to be in 'next':<br>
<br>
<br>
e8577e4 2013-04-10 (karlrupp/feature-viennacl) ViennaCL: fix LOCDIR<br>
<br>
This has a simple conflict with 'knepley/remove-sieve' (below) in<br>
src/vec/vec/interface/vecregall.c<br>
<br>
b61a8fb 2013-03-15 (klaij/fieldsplit-simple-ex70) SNES ex70.c: free array returned by PCFieldSplitGetSubKSP()<br>
<br>
This example highlights a bug/feature request in fieldsplit. If it<br>
can be handled without interface changes, it should go to 'maint'.<br>
<br>
a05fad5 2013-05-12 (knepley/remove-sieve) DMPlex: remove bad "DMMESH" documentation<br>
<br>
This branch is a bit chaotic and could reasonably be rebased and have<br>
the incomplete commits squashed together.<br>
<br>
1cf896f 2013-03-22 (knepley/solkx) SNES ex75: Added Maple verification test, and added preliminary FEM test<br>
<br>
This branch contains one commit (a9ffcdab03f) that is unrelated and<br>
made it into v3.4 in a different form (3e298deff27), so rebasing would<br>
make it cleaner.<br></blockquote><div><br></div><div>These two have been rebased and pushed.</div><div><br></div><div> Matt</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
aee7f6d 2013-05-08 (prbrune/snes-npcjacobianlagging) Tests for persistent lagging of the Jacobian or Preconditioner<br>
<br>
This made changes to src/snes/examples/tutorials ex15_4 that conflict<br>
with 'prbrune/snes-npcrhsfix' (merged 2013-05-03). It should either<br>
be rebased or it should merge from v3.4.<br>
<br>
<br>
The remaining commits in 'next' have either been rebased (Karl<br>
accidentally rebased 'karlrupp/feature-viennacl' after merging it to<br>
'next') or are commits that were made in an inappropriate place and were<br>
later cherry-picked back to the proper branch.<br>
<br>
ee5caa0 Revert "MPIUNI: Now it returns error codes correctly"<br>
5b3707c Revert "DMPlex: fix initialization of variables in degenerate case"<br>
607f2c0 DMPlex: fix initialization of variables in degenerate case<br>
2786d98 Repair bad merge of 'barry/rm-xxxregisterdynamic'<br>
2233159 ViennaCL: Updated to new AMS viewer model<br>
ec89c54 ViennaCL: Fixed includedir in viennacl.py package handler<br>
3cdc909 ViennaCL: Applied const-correctness to functions.<br>
9d766b4 ViennaCL: Eliminated whitespace violations, removed/fixed erroneous comments.<br>
c21fe5b ViennaCL: Device type can now be specified via command line.<br>
67575d3 ViennaCL: Now catching the correct type of exceptions (std::exception)<br>
19900a9 ViennaCL: Eliminated dead/unused code<br>
c2cfb21 ViennaCL: Fixed issues if size 0 is passed.<br>
bb99cb5 ViennaCL: Setting VIENNACL_WITH_OPENCL flag to enable OpenCL backend as default.<br>
4b3d4ac ViennaCL: Added package detector for OpenCL, added OpenCL-dependency for ViennaCL.<br>
9329d19 ViennaCL: Added MPI-implementation for AIJ matrices.<br>
19b9568 ViennaCL: Removed seqviennacl/aijassemble.cxx (would trigger error, now uses existing fallback)<br>
dbcb10b ViennaCL: Renamed files to fulfill conventions (.cpp -> .cxx, all lowercase), removed restriction of C++ everywhere.<br>
c65bdabe ViennaCL: Added sequential AIJ matrix.<br>
8bf5113 ViennaCL: Added MPI vectors.<br>
bff62fe ViennaCL: Removed unnecessary call to resize() at vector construction.<br>
1737cda ViennaCL: Download of package now working.<br>
8034546 ViennaCL: First draft, including all operations for sequential vectors.<br>
8de993d Bug fix for MatLoad_MPIBAIJ() buffer size for rank zero read was wrong size; simplified code as well MatLoad_MPIAIJ() also This fix can also be ported back to 3.3<br>
<br>
<br>
<br>
[1] You may remember that we normally ask branches to avoid merging from<br>
upstream. A release is an exception to this: the release should be at<br>
least as stable as the arbitrary place that you started working from,<br>
and it's a well-defined point, so it's perfectly acceptable to merge<br>
v3.4.<br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>What most experimenters take for granted before they begin their experiments is infinitely more interesting than any results to which their experiments lead.<br>
-- Norbert Wiener
</div></div>