From: Ian Jackson Date: Sat, 28 Jul 2018 04:27:05 +0000 (+0100) Subject: slides/talk X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=ad2268641a270b50a4bb11182da0e7e579dd2a02;p=talk-2018-dc18-gdr.git slides/talk --- diff --git a/Makefile b/Makefile index 7653aa0..dcbaa81 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ SLIDES+= dm-2 SLIDES+= dm-3 SLIDES+= dm-5 SLIDES+= dm-6 +SLIDES+= dm-rebase-again # made from 7 SLIDES+= dm-pre-wreck SLIDES+= dm-wreck # made from 4 SLIDES+= dm-post-wreck @@ -16,6 +17,7 @@ SLIDES+= dm-post-wreck # X3 edges (53 is included in wreck) # 1X0-9 "master" note # 1X3 not included in pre-wreck +# 151 included in rebase-again # for # X = # 1 [1] @@ -40,6 +42,10 @@ 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-rebase-again.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:79,151,170:179 <$@.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 diff --git a/dm.fig b/dm.fig index 1a38019..3c6e099 100644 --- a/dm.fig +++ b/dm.fig @@ -45,8 +45,6 @@ Single -90 -2700 1260 -2700 1800 -4500 2 1 1 2 0 7 12 -1 -1 6.000 0 0 7 0 0 2 -90 -2700 -540 -2700 -2 2 0 2 0 7 62 -1 -1 0.000 0 0 7 0 0 5 - 7290 -7380 8100 -7380 8100 -7560 7290 -7560 7290 -7380 2 3 0 2 0 7 62 -1 -1 0.000 0 0 7 0 0 6 7335 -7200 7425 -7065 8910 -7065 8910 -7335 7425 -7335 7335 -7200 2 1 1 2 0 7 62 -1 -1 6.000 0 0 7 0 0 2 @@ -76,8 +74,6 @@ Single 3363 -2704 5580 -2700 5850 -3600 2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 2 4410 -1800 4664 -2691 -2 2 0 2 0 7 150 -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 52 -1 -1 0.000 0 0 7 0 0 2 6119 -4500 6410 -5438 2 1 0 2 0 7 53 -1 -1 0.000 0 0 7 0 0 2 @@ -90,6 +86,10 @@ Single 3870 -5265 4230 -5265 4230 -4815 3870 -4815 3870 -5265 2 2 0 2 0 7 120 -1 -1 0.000 0 0 7 0 0 5 2385 -5310 3195 -5310 3195 -5490 2385 -5490 2385 -5310 +2 2 0 2 0 7 160 -1 20 0.000 0 0 7 0 0 5 + 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 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 @@ -113,7 +113,6 @@ Single 4 0 0 10 -1 14 20 0.0000 4 210 195 1440 -3510 1\001 4 0 0 10 -1 16 20 0.0000 4 240 1650 -135 -2160 Breakwater\001 4 0 0 30 -1 14 20 0.0000 4 195 195 3195 -2610 C\001 -4 0 0 62 -1 14 12 0.0000 4 120 720 7335 -7425 master\001 4 0 0 62 -1 14 12 0.0000 4 150 1440 7425 -7155 debian/1.2-1\001 4 0 0 60 -1 14 20 0.0000 4 255 195 6885 -7200 /\001 4 0 0 130 -1 14 12 0.0000 4 120 720 4500 -5355 master\001 @@ -157,7 +156,6 @@ Single 4 0 0 41 -1 16 20 0.0000 4 315 2895 1665 -810 Upstream git history\001 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 @@ -172,3 +170,5 @@ 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 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 diff --git a/talk.txt b/talk.txt index df773c2..562247a 100644 --- a/talk.txt +++ b/talk.txt @@ -157,7 +157,7 @@ quick demo. Sean ? ===== demo -===== data model slide up to "2" [1] +===== data model slide "commit history structure" showing master=2 Now you've seen it in action, I'm going to quickly run through the data model and history structure. @@ -192,7 +192,7 @@ the relevant commit (whether that's upstream, or one of yours). OK then, suppose you make a change like the one Sean made in the demo: -===== data model slide up to "D3" [2] +===== data model slide "commit history structure" showing master=C3 I'm calling this C3. The reason for this name will be clear in a moment. @@ -212,7 +212,7 @@ So, you run git-debrebase -i. The usual git-rebase todo list comes up, and you will see in it what looks like commit C3, and reorder that. Assuming there are no conflicts, the result looks like this: -===== data model slide up to "2'" [3] +===== data model slide "commit history structure after git-debrebase" You can see that C3 has been split into two commits: C', which contains the changelog change, and 3' which contains the upstream @@ -230,7 +230,7 @@ breakwater. What about a new upstream version ? -===== data model slide up to "2''" [4] +===== data model slide "commit history structure after new-upstream" To rebase onto a new upstream version, you run git-debrebase new-upstream. git-debrebase expects the upstream code in the form of @@ -258,7 +258,7 @@ have to make an orig tarball of the new upstream. If you're using the workflow I've been describing so far, that's generally just a single call to git-deborig. -===== data model slide up to PM [5] +===== data model slide "commit history structure after upload" So, indeed, let's consider an upload to Debian. (And let's imagine you made or obtained a suitable orig tarball.) @@ -297,7 +297,7 @@ delta queue to debian/patches. You can safely ignore these autogenerated commits -===== data model slide up to PM [5] AGAIN +===== data model slide "commit history structure rebasing again" And indeed, they will be stripped out: