wip zoom

diff --git a/Makefile b/Makefile
index f1f8685c89ee840f04ed076a2e9134231082cf21..64efd1d521c3d8fb58c09c54fb31b7c2303f628a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SLIDES+= dm-2
 SLIDES+= dm-3
 SLIDES+= dm-5
 SLIDES+= dm-6
-SLIDES+= dm-8
+SLIDES+= dm-zoom # made from 6
 SLIDES+= dm-6
 SLIDES+= dm-rebase-again # made from 7
 SLIDES+= dm-pre-wreck
@@ -20,10 +20,11 @@ SLIDES+= dm-6
 #   1X2    edges
 #   1X3    edges (53 is included in wreck)
 #   1X4,5  upstream git history
+#   1X6    include in zooms
 #   2X0-9  "master" note
 #   2X3    not included in pre-wreck
 #   251    included in rebase-again
-#   119    not in zoom
+#[12]X6    exclude from zoom
 # for
 #    X =
 #      1      [1]
@@ -55,6 +56,10 @@ dm-rebase-again.ps: dm.fig conflict.txt.eps
        iconv <$@.fig.tmp >$@.1 -f UTF-8 -t ISO-8859-1
        LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+110:179,251,270:279 <$@.1 $o
 
+dm-zoom.ps: dm.fig conflict.txt.eps
+       iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+110:165,167:169,260:265,266:269 <$@.1 $o
+
 dm-pre-wreck.ps: dm.fig conflict.txt.eps
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
        LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+110:139,144:145,230:232,235:239 <$@.1 $o
@@ -65,7 +70,7 @@ dm-post-wreck.ps: dm.fig conflict.txt.eps
 
 dm-wreck.ps: dm.fig conflict.txt.eps
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
-       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:3,5,144:145,153,+110:149,240:s49 <$@.1 $o
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:3,5,144:145,153,+110:149,240:249 <$@.1 $o
 
 %.eps:   %.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1

diff --git a/dm.fig b/dm.fig
index cb26197358f0e29b37a01d2e30916afca5f3ba30..d0ea262ff568a79d58e4687a5a7e7bd4e602510d 100644 (file)
--- a/dm.fig
+++ b/dm.fig
@@ -78,12 +78,8 @@ Single
         3870 -5265 4230 -5265 4230 -4815 3870 -4815 3870 -5265
 2 2 0 2 0 7 220 -1 -1 0.000 0 0 7 0 0 5
         2385 -5310 3195 -5310 3195 -5490 2385 -5490 2385 -5310
-2 2 0 2 0 7 260 -1 20 0.000 0 0 7 0 0 5
-        7290 -7380 8100 -7380 8100 -7560 7290 -7560 7290 -7380
 2 2 0 2 0 7 251 -1 -1 0.000 0 0 7 0 0 5
         6705 -5310 7515 -5310 7515 -5490 6705 -5490 6705 -5310
-2 2 0 2 32 7 271 -1 20 0.000 0 0 7 0 0 5
-        7290 -7380 9045 -7380 9045 -7560 7290 -7560 7290 -7380
 2 1 0 2 0 7 153 -1 -1 0.000 0 0 7 0 0 2
         5844 -3616 6138 -4523
 2 1 0 2 0 7 152 -1 -1 0.000 0 0 7 0 0 2
@@ -95,6 +91,10 @@ Single
 2 3 0 2 0 7 161 -1 20 0.000 0 0 7 0 0 7
         6960 -7087 7155 -7199 7155 -7425 6960 -7537 6765 -7424 6765 -7199
         6960 -7087
+2 2 0 2 32 7 271 -1 20 0.000 0 0 7 0 0 5
+        7290 -7380 9045 -7380 9045 -7560 7290 -7560 7290 -7380
+2 2 0 2 0 7 260 -1 -1 0.000 0 0 7 0 0 5
+        7290 -7380 8100 -7380 8100 -7560 7290 -7560 7290 -7380
 3 2 0 2 0 7 144 -1 -1 0.000 0 0 0 3
         3510 -1260 2925 -1620 2430 -1215
         0.000 -1.000 0.000
@@ -167,15 +167,15 @@ Single
 4 0 0 269 -1 16 24 0.0000 4 375 2160 6255 -7920 after upload\001
 4 0 0 233 -1 16 24 0.0000 4 390 3435 6255 -7920 after git-debrebase\001
 4 0 0 4 -1 16 24 0.0000 4 300 2745 6255 -7920 aborted rebase\001
-4 0 0 161 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001
 4 0 0 5 -1 16 24 0.0000 4 375 3195 6304 -7546 for new-upstream\001
-4 0 0 270 -1 16 24 0.0000 4 375 2160 6255 -7920 rebasing again\001
-4 0 0 260 -1 14 12 0.0000 4 120 720 7335 -7425 master\001
+4 0 0 270 -1 16 24 0.0000 4 390 2670 6255 -7920 rebasing again\001
 4 0 0 251 -1 14 12 0.0000 4 120 720 6750 -5355 master\001
-4 0 32 270 -1 14 12 0.0000 4 180 1800 7335 -7425 ffq-prev/master\001
 4 0 0 160 -1 14 20 0.0000 4 255 195 6865 -7215 /\001
 4 0 0 144 -1 16 20 0.0000 4 315 2895 1665 -810 Upstream git history\001
 4 0 32 130 -1 0 15 0.0000 4 180 1275 2329 -5455 no ref refers,\001
 4 0 32 130 -1 0 15 0.0000 4 225 1140 2385 -5265 will be gc'd\001
 4 0 32 140 -1 0 15 0.0000 4 180 1275 4398 -5439 no ref refers,\001
 4 0 32 140 -1 0 15 0.0000 4 225 1140 4423 -5263 will be gc'd\001
+4 0 0 166 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001
+4 0 0 260 -1 14 12 0.0000 4 120 720 7335 -7425 master\001
+4 0 32 270 -1 14 12 0.0000 4 180 1800 7335 -7425 ffq-prev/master\001