new pseudomerge slide

diff --git a/Makefile b/Makefile
index 64efd1d521c3d8fb58c09c54fb31b7c2303f628a..1efc601ec5ebde4c05bb020864ca6a8db58825e2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ dm-rebase-again.ps: dm.fig conflict.txt.eps
 
 dm-zoom.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+110:165,167:169,260:265,266:269 <$@.1 $o
+       LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:11,110:165,167:169,260:265,266:269 <$@.1 $o
 
 dm-pre-wreck.ps: dm.fig conflict.txt.eps
        iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1

diff --git a/dm.fig b/dm.fig
index d0ea262ff568a79d58e4687a5a7e7bd4e602510d..151bf44611000f2e6d9e140ac4b9a0ca77937d96 100644 (file)
--- a/dm.fig
+++ b/dm.fig
@@ -25,6 +25,15 @@ Single
         4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575
 4 0 0 44 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001
 -6
+6 3150 -3465 9990 -1665
+2 2 0 2 0 7 11 -1 20 0.000 0 0 7 0 0 5
+        3195 -3420 9945 -3420 9945 -1710 3195 -1710 3195 -3420
+4 0 0 10 -1 2 20 0.0000 4 300 5505 3375 -2670 A multi-parent commit made by taking\001
+4 0 0 10 -1 3 20 0.0000 4 300 1860 3375 -3060 Pseudomerge\001
+4 0 0 10 -1 2 20 0.0000 4 300 6360 3375 -2340 just the contents of exactly one of its parents.\001
+4 0 0 10 -1 2 20 0.0000 4 300 1020 3375 -1890 e.g., by\001
+4 0 0 10 -1 14 20 0.0000 4 270 3315 4725 -1890 git merge -s ours\001
+-6
 1 3 0 2 0 7 151 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400
 1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500
 1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 4140 -5400 225 225 4140 -5400 4365 -5400
@@ -36,8 +45,8 @@ Single
 1 3 0 2 0 7 141 -1 20 0.000 1 0.0000 5850 -3600 225 225 5850 -3600 6075 -3600
 1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 7470 -3150 225 225 7470 -3150 7695 -3150
 1 3 0 2 0 7 151 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500
-1 3 0 2 0 7 121 -1 20 0.000 1 0.0000 2070 -5400 225 225 2070 -5400 2295 -5400
 1 3 0 2 0 7 145 -1 20 0.000 1 0.0000 4365 -1575 225 225 4365 -1575 4590 -1575
+1 3 0 2 0 7 121 -1 20 0.000 1 0.0000 2070 -5400 225 225 2070 -5400 2295 -5400
 2 1 0 2 0 7 132 -1 -1 0.000 0 0 7 0 0 3
         1305 -2700 3330 -2700 4140 -5400
 2 1 0 2 0 7 122 -1 20 0.000 0 0 -1 0 0 2
@@ -88,13 +97,18 @@ Single
         6745 -6522 6385 -5352
 2 1 0 2 0 7 162 -1 -1 0.000 0 0 7 0 0 3
         630 -7290 6975 -7290 6705 -6480
-2 3 0 2 0 7 161 -1 20 0.000 0 0 7 0 0 7
-        6960 -7087 7155 -7199 7155 -7425 6960 -7537 6765 -7424 6765 -7199
-        6960 -7087
 2 2 0 2 32 7 271 -1 20 0.000 0 0 7 0 0 5
         7290 -7380 9045 -7380 9045 -7560 7290 -7560 7290 -7380
 2 2 0 2 0 7 260 -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 161 -1 20 0.000 0 0 7 0 0 7
+        6960 -7087 7155 -7199 7155 -7425 6960 -7537 6765 -7424 6765 -7199
+        6960 -7087
+2 1 0 2 0 7 11 -1 20 0.000 0 0 -1 1 0 2
+       3 1 1.00 60.00 120.00
+        7155 -3420 7020 -7020
+2 2 0 2 32 7 10 -1 -1 0.000 0 0 7 0 0 5
+        -675 -7020 1080 -7020 1080 -7200 -675 -7200 -675 -7020
 3 2 0 2 0 7 144 -1 -1 0.000 0 0 0 3
         3510 -1260 2925 -1620 2430 -1215
         0.000 -1.000 0.000
@@ -122,7 +136,6 @@ Single
 4 0 0 230 -1 14 12 0.0000 4 120 720 4500 -5355 master\001
 4 0 0 220 -1 14 12 0.0000 4 120 720 2430 -5355 master\001
 4 0 0 210 -1 14 12 0.0000 4 120 720 2160 -4455 master\001
-4 0 0 120 -1 14 20 0.0000 4 210 390 1890 -5310 C3\001
 4 0 0 161 -1 12 12 0.0000 4 180 1080 5490 -6390 d/patches\001
 4 0 0 162 -1 0 12 0.0000 4 0 45 5130 -7335  \001
 4 0 0 162 -1 16 20 0.0000 4 315 2790 1215 -7425 Interchange branch\001
@@ -176,6 +189,10 @@ Single
 4 0 32 130 -1 0 15 0.0000 4 225 1140 2385 -5265 will be gc'd\001
 4 0 32 140 -1 0 15 0.0000 4 180 1275 4398 -5439 no ref refers,\001
 4 0 32 140 -1 0 15 0.0000 4 225 1140 4423 -5263 will be gc'd\001
-4 0 0 166 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001
 4 0 0 260 -1 14 12 0.0000 4 120 720 7335 -7425 master\001
 4 0 32 270 -1 14 12 0.0000 4 180 1800 7335 -7425 ffq-prev/master\001
+4 0 0 120 -1 14 20 0.0000 4 210 390 1890 -5310 C3\001
+4 0 0 10 -1 2 15 0.0000 4 225 1350 5400 -7110 pseudomerge\001
+4 0 0 166 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001
+4 0 32 10 -1 14 12 0.0000 4 180 1800 -630 -7065 ffq-prev/master\001
+4 0 32 10 -1 0 15 0.0000 4 225 1470 -675 -7380 was previously\001

diff --git a/talk.txt b/talk.txt
index b103ca4004c62ebe4ed85213cbb59000a03f19b9..9b0c7e6667cea296eba1ff8431c45e131d4b3227 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -274,7 +274,7 @@ Firstly, you're going to publish your history, so your history has to
 be made fast forward from the previous version of the package.  To
 achieve this, git-debrebase will make a pseudomerge.
 
-===== data model zoom in on pseudomerge
+===== data model slide - pseudomerge box overlay
 
 A pseudomerge is a merge commit which takes its contents from only one
 of its parents.  You would make one by hand with git-merge -s ours,
@@ -288,7 +288,7 @@ one, so it is right to declare that it is fast forward, too.
 The branch with the pseudomerge is suitable for pushing to any git
 server.  It's what you would push to salsa, say.
 
-===== data model zoom in on pseudomerge and add patches 4b
+===== data model slide "commit history structure after upload"
 
 Secondly, when you upload a 3.0 quilt package, the contents of
 debian/patches need to be right.  Again, that is taken care of
@@ -297,8 +297,6 @@ delta queue to debian/patches.
 
 You can ignore these autogenerated commits.
 
-===== data model slide "commit history structure after upload"
-
 After uploading you'll want to push your branch to salsa, if you have
 a team repository there.  That makes sure all the views of your
 package are up to date, so that other members of your team won't
@@ -318,15 +316,18 @@ tidy the branch up, you can run git-debrebase:
 
 ===== data model slide "commit history structure rebasing again"
 
-It strips off the bureaucracy commits.  If you made any commits on top
-on top of the pseudomerge (or you pulled any such commits from salsa,
-or whereever), it folds those back into the breakwater and the delta
-queue.  So you once again a nice delta queue to edit.
+It strips off the bureaucracy commits.  Those remain published, of
+course, but they are removed from your own master branch.
+
+If you made any commits on top on top of the pseudomerge (or you
+pulled any such commits from salsa, or whereever), it folds those back
+into the breakwater and the delta queue.  So you once again a nice
+delta queue to edit.
 
 git-debrebase makes a note of where you were previously, so that when
 you next want to push or upload, it can stitch the history back in
 with another pseudomerge.  At the start of this walkthough, that ref
-was indeed present - I glossed over it.
+was indeed present - I glossed over that a bit.
 
 ===== data model slide "commit history structure" again