Tracking issue for messed-up push to master

[tmbgreaves]

Mea culpa - in attempting to pull @gnikit 's branch into this repo I appear to have pushed a merge commit to master by mistake. I think this is actually a no-change commit but am working on figuring out how much I've messed things up.

Apologies to all for the error - will update this issue as I figure out what I've done, others please feel free to add input.

[gnikit]

I think we might be okay, this is what the merge did to master

remote: Enumerating objects: 30, done.                                                                                                                                                                                                        
remote: Counting objects: 100% (30/30), done.                                                                                                                                                                                                 
remote: Compressing objects: 100% (22/22), done.                                                                                                                                                                                              
remote: Total 30 (delta 8), reused 25 (delta 8), pack-reused 0                                                                                                                                                                                
Unpacking objects: 100% (30/30), done.                                                                                                                                                                                                        
From https://github.com/FluidityProject/fluidity                                                                                                                                                                                              
   866e38a42..4f60f3fdc  master                    -> origin/master                                                                                                                                                                           
 * [new branch]          feature/update-vtkfortran -> origin/feature/update-vtkfortran                                                                                                                                                        
Updating 866e38a42..4f60f3fdc                                                                                                                                                                                                                 
Fast-forward                                                                                                                                                                                                                                  
 femtools/VTK_interfaces.F90             |   8 +++-----                                                                                                                                                                                       
 femtools/tests/test_vtk_elements.F90    | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++                                          
 libvtkfortran/vtkfortran.cpp            |  42 ++++--------------------------------------                                                                                                                                                     
 libvtkfortran/vtkmeshio.cpp             |  79 +------------------------------------------------------------------------------                                                                                                                
 python/fluidity/diagnostics/meshes.py   |   6 +++---                                                                                                                                                                                         
 python/fluidity/diagnostics/vtutools.py |  28 ----------------------------                                                                                                                                                                   
 tests/data/ref_vtk_hexahedra.vtu        | Bin 0 -> 1726 bytes                                                                                                                                                                                
 tests/data/ref_vtk_quad.vtu             | Bin 0 -> 1607 bytes                                                                                                                                                                                
 tests/data/ref_vtk_tetra.vtu            | Bin 0 -> 1608 bytes                                                                                                                                                                                
 tests/data/ref_vtk_triangle.vtu         | Bin 0 -> 1580 bytes                                                                                                                                                                                
 10 files changed, 160 insertions(+), 152 deletions(-)                                                                                                                                                                                        
 create mode 100644 femtools/tests/test_vtk_elements.F90                                                                                                                                                                                      
 create mode 100644 tests/data/ref_vtk_hexahedra.vtu                                                                                                                                                                                          
 create mode 100644 tests/data/ref_vtk_quad.vtu                                                                                                                                                                                               
 create mode 100644 tests/data/ref_vtk_tetra.vtu                                                                                                                                                                                              
 create mode 100644 tests/data/ref_vtk_triangle.vtu     

I don't see anything breaking, so maybe we dodged a bullet?

[tmbgreaves]

Oof, yes, I think so - I appear to have just merged by mistake. Apologies again, assuming all tests come back clean I think I'll chalk that one up to not engaging brain enough before pushing.

[tmbgreaves]

My mistake - I think I missed one branch change on my local clone, and picked the commits to master in error, as I do appear to have pushed the new branch but with no commits. Note to self - triple-check where commits have gone before pushing...