wip greyout

diff --git a/.gitignore b/.gitignore
index aab7ce3860c5585c7ffb43e1cb175709e0b206c7..a5d594e9fec9d99bf0928fffeef30a2dd883419a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ dm-*.ps.1
 slides.pdf
 slides.ps
 conflict.txt.eps
+*.tmp

diff --git a/Makefile b/Makefile
index dcbaa818b67afffb6c9be98d1934e6d54dea0e5d..3fcc54a835e5968c3b1ed95e19696bcffd80e5c9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,8 @@ dm-%.ps: dm.fig
        LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:$*9,1$*0:1$*9 <$@.1 $o
 
 dm-rebase-again.ps: dm.fig conflict.txt.eps
-       iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+       ./greyout <$< >$@.fig.tmp
+       iconv <$@.fig.tmp >$@.1 -f UTF-8 -t ISO-8859-1
        LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:79,151,170:179 <$@.1 $o
 
 dm-pre-wreck.ps: dm.fig conflict.txt.eps

diff --git a/dm.fig b/dm.fig
index 3c6e099f151c61122b79a845916f78f9c25638a4..acececba45b54c75500cbfbfdb1612319c085125 100644 (file)
--- a/dm.fig
+++ b/dm.fig
@@ -7,6 +7,7 @@ A4
 Single
 -2
 1200 2
+0 32 #888888
 6 3330 -3870 3870 -3330
 1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3600 -3600 225 225 3600 -3600 3825 -3600
 4 0 0 30 -1 14 20 0.0000 4 210 195 3465 -3510 1\001
@@ -59,8 +60,6 @@ Single
 2 3 0 2 0 7 61 -1 20 0.000 0 0 7 0 0 7
         6735 -6300 6930 -6412 6930 -6638 6735 -6750 6540 -6637 6540 -6412
         6735 -6300
-2 1 0 2 0 7 62 -1 -1 0.000 0 0 7 0 0 3
-        630 -7290 6975 -7290 6390 -5400
 2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7
         4680 -2475 4875 -2587 4875 -2813 4680 -2925 4485 -2812 4485 -2587
         4680 -2475
@@ -90,6 +89,14 @@ Single
         7290 -7380 8100 -7380 8100 -7560 7290 -7560 7290 -7380
 2 2 0 2 0 7 151 -1 -1 0.000 0 0 7 0 0 5
         6705 -5310 7515 -5310 7515 -5490 6705 -5490 6705 -5310
+2 1 0 2 0 7 62 -1 -1 0.000 0 0 7 0 0 3
+        630 -7290 6975 -7290 6705 -6480
+2 1 0 2 32 7 170 -1 -1 0.000 0 0 -1 0 0 2
+        6732 -6522 6372 -5352
+2 1 0 2 0 7 160 -1 -1 0.000 0 0 -1 0 0 2
+        6745 -6522 6385 -5352
+2 2 0 2 32 7 171 -1 20 0.000 0 0 7 0 0 5
+        7290 -7380 9045 -7380 9045 -7560 7290 -7560 7290 -7380
 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
@@ -170,5 +177,7 @@ Single
 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
+4 0 0 170 -1 16 24 0.0000 4 375 2160 6255 -7920 after upload\001
 4 0 0 160 -1 14 12 0.0000 4 120 720 7335 -7425 master\001
 4 0 0 151 -1 14 12 0.0000 4 120 720 6750 -5355 master\001
+4 0 32 170 -1 14 12 0.0000 4 180 1800 7335 -7425 ffq-prev/master\001

diff --git a/greyout b/greyout
new file mode 100755 (executable)
index 0000000..50a859e
--- /dev/null
+++ b/greyout
@@ -0,0 +1,6 @@
+#!/usr/bin/perl -p
+($l, $r, $depth) = m/^(4 \d+ )0( (\d+) .*)/ or
+#($l, $r, $depth) = m/^(4 \d+ )0( (\d+) .*)/ or
+    next;
+next unless $depth =~ m/6.$/;
+$_ = $l."32".$r."\n";