wip wreckage slide

diff --git a/Makefile b/Makefile
index 1062bc2a42f08f263adf9d99a668a040c76858cc..02706eb13bd0201bdc30e74215a560bf727e12d4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,9 @@ SLIDES+= dm-2
 SLIDES+= dm-3
 SLIDES+= dm-5
 SLIDES+= dm-6
-SLIDES+= dm-5
+SLIDES+= dm-3
 SLIDES+= dm-wreck # made from 4
+SLIDES+= dm-3
 #SLIDES+= manpage
 
 # layers

diff --git a/dm.fig b/dm.fig
index 5e8be56c5cc5d08bacbf488b5133db3c70399c66..c473b614514891f6d84632032cf4d632738879f1 100644 (file)
--- a/dm.fig
+++ b/dm.fig
@@ -17,15 +17,14 @@ Single
         4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575
 4 0 0 41 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001
 -6
-6 2925 -6030 8370 -4230
+6 3150 -6930 8595 -5130
 2 5 0 1 0 -1 1 -1 -1 0.000 0 0 -1 0 0 5
        0 conflict.txt.eps
-        3060 -5895 8287 -5895 8287 -4338 3060 -4338 3060 -5895
+        3285 -6795 8512 -6795 8512 -5238 3285 -5238 3285 -6795
 2 2 0 2 0 7 2 -1 20 0.000 0 0 -1 0 0 5
-        2970 -5985 8325 -5985 8325 -4275 2970 -4275 2970 -5985
+        3195 -6885 8550 -6885 8550 -5175 3195 -5175 3195 -6885
 -6
 1 3 0 2 0 7 51 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400
-1 3 0 2 0 7 51 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500
 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500
 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 4140 -5400 225 225 4140 -5400 4365 -5400
 1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 360 -2700 225 225 360 -2700 585 -2700
@@ -37,6 +36,7 @@ Single
 1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 4365 -1575 225 225 4365 -1575 4590 -1575
 1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 5850 -3600 225 225 5850 -3600 6075 -3600
 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 7470 -3150 225 225 7470 -3150 7695 -3150
+1 3 0 2 0 7 51 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500
 2 1 0 2 0 7 32 -1 -1 0.000 0 0 7 0 0 3
         1305 -2700 3330 -2700 4140 -5400
 2 1 0 2 0 7 22 -1 20 0.000 0 0 -1 0 0 2
@@ -84,8 +84,12 @@ Single
         6119 -4500 6410 -5438
 2 1 0 2 0 7 53 -1 -1 0.000 0 0 7 0 0 2
         5844 -3616 6138 -4523
+2 1 0 2 0 7 1 -1 20 0.000 0 0 -1 0 0 2
+        6345 -4680 8550 -5175
+2 1 0 2 0 7 1 -1 20 0.000 0 0 -1 0 0 2
+        3195 -5175 5850 -4680
 2 2 0 2 7 7 3 -1 20 0.000 0 0 -1 0 0 5
-        3600 -4365 3960 -4365 3960 -4095 3600 -4095 3600 -4365
+        3870 -5265 4230 -5265 4230 -4815 3870 -4815 3870 -5265
 3 2 0 2 0 7 41 -1 20 0.000 0 0 0 3
         4725 -1215 4005 -1665 3510 -1260
         0.000 -1.000 0.000
@@ -97,7 +101,6 @@ Single
         0.000 -1.000 0.000
 4 0 0 50 -1 14 20 0.0000 4 210 195 6255 -5310 2\001
 4 0 0 50 -1 14 20 0.0000 4 90 195 6390 -5310 "\001
-4 0 0 50 -1 14 20 0.0000 4 210 195 5985 -4410 3\001
 4 0 0 50 -1 14 20 0.0000 4 90 195 6120 -4410 "\001
 4 0 0 30 -1 14 20 0.0000 4 210 195 4005 -5310 2\001
 4 0 0 30 -1 14 20 0.0000 4 90 195 4140 -5310 '\001
@@ -156,3 +159,10 @@ Single
 4 0 0 40 -1 14 20 0.0000 4 90 195 5850 -3510 "\001
 4 0 0 40 -1 14 20 0.0000 4 210 195 5715 -3510 1\001
 4 0 0 150 -1 14 12 0.0000 4 120 720 6750 -5355 master\001
+4 0 0 50 -1 14 20 0.0000 4 210 195 5985 -4410 3\001
+4 0 0 1 -1 14 24 0.0000 4 255 480 5895 -4410 X3\001
+4 0 0 1 -1 16 24 0.0000 4 300 2340 6660 -7920 failed rebase\001
+4 0 0 130 -1 16 24 0.0000 4 390 3435 6255 -7920 after git-debrebase\001
+4 0 0 150 -1 16 24 0.0000 4 375 3540 6255 -7920 after new-upstream\001
+4 0 0 10 -1 16 24 0.0000 4 390 7260 -900 -7920 git-debrebase - commit history structure\001
+4 0 0 160 -1 16 24 0.0000 4 375 2160 6255 -7920 after upload\001