From: Ian Jackson Date: Fri, 27 Jul 2018 15:05:28 +0000 (+0100) Subject: failed rebase demo good X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=49eb8c683c002ea356d79096233c0a10486eebd9;p=talk-2018-dc18-gdr.git failed rebase demo good --- diff --git a/Makefile b/Makefile index 103788c..7653aa0 100644 --- 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 661f24f..1a38019 100644 --- 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