Automated merge with https://tqft.net/hg/blob/
authorKevin Walker <kevin@canyon23.net>
Mon, 28 Jun 2010 08:54:36 -0700
changeset 408 37f036dda03c
parent 405 2e1b1efbf928 (diff)
parent 407 a11a1a65cb6d (current diff)
child 409 291f82fb79b5
Automated merge with https://tqft.net/hg/blob/
--- a/build.xml	Sun Jun 27 13:11:00 2010 -0700
+++ b/build.xml	Mon Jun 28 08:54:36 2010 -0700
@@ -63,6 +63,11 @@
     </target>
     
     <target name="copy-pdf" depends="pdf">
+        <exec executable="svn" dir="../../Sites/tqft.net/papers/">
+            <arg value="up"/>
+	    <arg value="--accept"/>
+	    <arg value="theirs-full"/>
+        </exec>
         <copy file="blob1.pdf" tofile="../../Sites/tqft.net/papers/blobs.pdf"/>
         <exec executable="svn" dir="../../Sites/tqft.net/papers/">
             <arg value="commit"/>
--- a/text/appendixes/smallblobs.tex	Sun Jun 27 13:11:00 2010 -0700
+++ b/text/appendixes/smallblobs.tex	Mon Jun 28 08:54:36 2010 -0700
@@ -119,7 +119,7 @@
 It may be useful to look at Figure \ref{fig:erectly-a-tent-badly} to help understand the arrangement. The red, blue and orange $2$-cells there correspond to the $m=0$, $m=1$ and $m=2$ terms respectively, while the $3$-cells (only one of each type is shown) correspond to the terms in the homotopy $h$.
 \begin{figure}[!ht]
 $$\mathfig{0.5}{smallblobs/tent}$$
-\caption{``Erecting a tent badly.'' We know where we want to send a simplex, and each of the iterated boundary components. However, these do not agree, and we need to stitch the pieces together. Note that these diagrams don't exactly match the situation in the text: a $k$-simplex has $k+1$ boundary components, while a $k$-blob has $k$ boundary terms.}
+\caption{``Erecting a tent badly.'' We know where we want to send a simplex, and each of the iterated boundary components. However, these do not agree, and we need to stitch the pieces together. Note that these diagrams don't exactly match the situation in the text: a $k$-simplex has $k+1$ boundary components, while a $k$-blob has $k$ boundary terms. \nn{turn upside?}}
 \label{fig:erectly-a-tent-badly}
 \end{figure}