failed rebase demo good

diff --git a/Makefile b/Makefile
index 103788c1da10c7511f39e567d613211f3f5348e9..7653aa0e5d0d63c1c28b9b079c30a5dd8c9e2eec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,11 +46,11 @@ dm-pre-wreck.ps: dm.fig conflict.txt.eps
 
 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
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+4,5,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
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:3,5,53,+10:49,140:149 <$@.1 $o
 
 %.eps:   %.fig
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1

diff --git a/dm.fig b/dm.fig
index 661f24f64bcb6b9dd81036ee608b1f0d6b06551c..1a38019e74a2c9078de46bf458f4999238f516a8 100644 (file)
--- a/dm.fig
+++ b/dm.fig
@@ -138,7 +138,6 @@ Single
 4 0 0 32 -1 14 12 0.0000 4 120 240 4815 -4320 C3\001
 4 0 0 32 -1 14 12 0.0000 4 120 240 3555 -2115 C3\001
 4 0 0 61 -1 0 15 0.0000 4 225 1170 5400 -6570 (re)generate\001
-4 0 0 61 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001
 4 0 0 60 -1 14 20 0.0000 4 195 195 6643 -6423 %\001
 4 0 0 30 -1 14 20 0.0000 4 90 195 7425 -3060 '\001
 4 0 0 32 -1 0 15 0.0000 4 165 735 8055 -3015 rebased\001
@@ -166,8 +165,10 @@ Single
 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 300 2925 6255 -7920 new u/s aborted\001
+4 0 0 4 -1 16 24 0.0000 4 300 2745 6255 -7920 aborted rebase\001
 4 0 0 30 -1 0 15 0.0000 4 180 1275 2329 -5455 no ref refers,\001
 4 0 0 30 -1 0 15 0.0000 4 225 1140 2385 -5265 will be gc'd\001
 4 0 0 40 -1 0 15 0.0000 4 180 1275 4398 -5439 no ref refers,\001
 4 0 0 40 -1 0 15 0.0000 4 225 1140 4423 -5263 will be gc'd\001
+4 0 0 61 -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