<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Dec 17, 2013 at 8:25 AM, Peter Brune <span dir="ltr"><<a href="mailto:prbrune@gmail.com" target="_blank">prbrune@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">OK, it's completely ludicrous that this isn't fixed. Matt, you have this series of changesets</div>
</blockquote><div><br></div><div>I am fucking traveling. I will fix it when I come home tonight.</div><div><br></div><div>As the changeset comments read, I was fixing a bad rebase. The changesets were dropped from</div><div>
a branch, but had been in master for a long time. I was just merging them to master as we do</div><div>for all branches we want in.</div><div><br></div><div>I do not understand why the merge to master had problem with next, but it will be simple to fix</div>
<div>when I am on the bus tonight.</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"><div dir="ltr"><div><div>69d8a9c DMPlex: More fixup from bad rebase, moved to DMGet/SetCoordinateSection()</div>
<div>e8abe2d DM: Added DMGet/SetCoordinateSection()</div><div>d7a12f9 Fuckup: Fix for merge that is still untangling bad rebase from Oct. 17th 2013 - Fixed const in declarations - Fixed merge from PetscFE - Fixed 2 mallocs</div>
<div>e1648df replace all echo in test/tutorial makefiles with printf since echo behaves differently on different systems</div><div>bb619f4 DMDA: Missing header - Damn rebase</div><div>6de54ef DMPlex ex3: Added 2D Q_1 and 3D P_2 tests</div>
<div>9a800dd DMDA: Added DMDAProjectFunction() and DMDAComputeL2Diff()</div><div>3bfb4c2 DMDA: Fixed 2D geometry - Should reuse DMPlex routines</div><div>32638f2 DMDA: Fix bug in 2D closure operation for cells</div><div>
a1ac9ad DMDA: Make closure operations also return the size</div>
<div>affa55c DMDA: Changed DMDACreateSection() to emulate DMPlexCreateSection()</div><div>3385ff7 DMDA: Added functions which emulate DMPlex functionality</div><div>3582350 DMDA: Now DMDAGetNumCells() returns the cells in each direction as well</div>
</div><div><br></div><div>that probably shouldn't be in 'master'. They conflict with</div><div><br></div><div><a href="https://bitbucket.org/petsc/petsc/commits/branch/knepley/feature-dmda-section" target="_blank">https://bitbucket.org/petsc/petsc/commits/branch/knepley/feature-dmda-section</a><br>
</div><div><br></div><div>and potentially other stuff in 'next'. What's with all the working directly on 'master' we're seeing now?</div><span class="HOEnZb"><font color="#888888"><div><br></div>
<div>- Peter</div></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra">
<br><br><div class="gmail_quote">On Mon, Dec 16, 2013 at 12:56 PM, Matthew Knepley <span dir="ltr"><<a href="mailto:knepley@gmail.com" target="_blank">knepley@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div>On Sun, Dec 15, 2013 at 9:23 AM, Barry Smith <span dir="ltr"><<a href="mailto:bsmith@mcs.anl.gov" target="_blank">bsmith@mcs.anl.gov</a>></span> wrote:<br>
</div><div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br>
Matt,<br>
<br>
Is master ahead of next on some code now? I tried to merge a tiny change on a branch I just made off of master into next and got this:<br></blockquote><div><br></div></div><div>Okay, I will fix it. It may take me until tonight since I am in Madison at a meeting.</div>
<div><br></div><div>I am not sure why Git cannot do this merge, but it should be easy.</div><div><br></div><div> Matt</div><div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
~/Src/petsc next $ git merge barry/compressed-coloring-only-for-square-matrices<br>
Auto-merging src/dm/impls/plex/plexrefine.c<br>
CONFLICT (content): Merge conflict in src/dm/impls/plex/plexrefine.c<br>
Auto-merging src/dm/impls/plex/plexgeometry.c<br>
CONFLICT (content): Merge conflict in src/dm/impls/plex/plexgeometry.c<br>
Auto-merging src/dm/impls/da/dalocal.c<br>
CONFLICT (content): Merge conflict in src/dm/impls/da/dalocal.c<br>
Auto-merging src/dm/impls/da/dageometry.c<br>
CONFLICT (content): Merge conflict in src/dm/impls/da/dageometry.c<br>
Auto-merging src/dm/dt/interface/dtfe.c<br>
CONFLICT (content): Merge conflict in src/dm/dt/interface/dtfe.c<br>
Auto-merging include/petscdmda.h<br>
CONFLICT (content): Merge conflict in include/petscdmda.h<br>
Auto-merging config/builder.py<br>
CONFLICT (content): Merge conflict in config/builder.py<br>
Automatic merge failed; fix conflicts and then commit the result.<br>
~/Src/petsc next|MERGING $ git merge —abort<br>
<br>
Until this is resolved no one can put new things into next<br>
<br>
Thanks<br>
<span><font color="#888888"><br>
Barry<br>
<br>
<br>
<br>
</font></span></blockquote></div></div><span><font color="#888888"><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
</font></span></div></div>
</blockquote></div><br></div>
</div></div></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>