From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 27 Jul 2018 14:53:20 +0000 (+0100)
Subject: before/after wreck
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=fdf084772c1a100a7fb6727f3288d89d48aaa57c;p=talk-2018-dc18-gdr.git

before/after wreck
---

diff --git a/Makefile b/Makefile
index 02706eb..103788c 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ SLIDES+= dm-2
 SLIDES+= dm-3
 SLIDES+= dm-5
 SLIDES+= dm-6
-SLIDES+= dm-3
+SLIDES+= dm-pre-wreck
 SLIDES+= dm-wreck # made from 4
-SLIDES+= dm-3
+SLIDES+= dm-post-wreck
 #SLIDES+= manpage
 
 # layers
@@ -15,6 +15,7 @@ SLIDES+= dm-3
 #    X2    edges
 #    X3    edges (53 is included in wreck)
 #   1X0-9  "master" note
+#   1X3    not included in pre-wreck
 # for
 #    X =
 #      1      [1]
@@ -39,6 +40,14 @@ dm-%.ps: dm.fig
 	iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
 	LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:$*9,1$*0:1$*9 <$@.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+10:39,130:132,135:139 <$@.1 $o
+
+dm-post-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+4,10:39,130:132,135:139 <$@.1 $o
+
 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,53,+10:49,140:149 <$@.1 $o
diff --git a/dm.fig b/dm.fig
index c473b61..1862258 100644
--- a/dm.fig
+++ b/dm.fig
@@ -162,7 +162,8 @@ Single
 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
+4 0 0 133 -1 16 24 0.0000 4 390 3435 6255 -7920 after git-debrebase\001
+4 0 0 4 -1 16 24 0.0000 4 390 3435 6255 -7920 new u/s aborted\001