usp-2

diff --git a/Makefile b/Makefile
index 840081d24feb5927aeb69e4c5cf11a7177ba373b..538036dbce56aa3e34be509aaf76e8d80be9b5fb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 
 SLIDES+= context
 SLIDES+= usp-1
+SLIDES+= usp-2
 SLIDES+= dm-1
 SLIDES+= dm-2
 SLIDES+= dm-3

diff --git a/usp-1.fig b/usp-1.fig
index d42b99545cf0106cc9d1c26f1ee83ef2b4ad5de5..7ffadd20fd33c251d0a76f46a626f18e3c0a5a43 100644 (file)
--- a/usp-1.fig
+++ b/usp-1.fig
@@ -18,7 +18,7 @@ Single
 4 0 0 100 -1 2 20 0.0000 4 300 4080 1395 -4395 May make "mixed" commits\001
 -6
 2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5
-        1125 -270 12555 -270 12555 -8055 1125 -8055 1125 -270
+        1080 -270 12510 -270 12510 -8055 1080 -8055 1080 -270
 4 0 0 100 -1 2 20 0.0000 4 225 2820 1395 -2790 No in-tree metadata\001
 4 0 0 100 -1 2 18 0.0000 4 255 2835 3735 -5985 ... unlike any other tool\001
 4 0 0 100 -1 2 18 0.0000 4 255 4905 3600 -3960 ... unlike any other delta queue workflow\001

diff --git a/usp-2.fig b/usp-2.fig
new file mode 100644 (file)
index 0000000..fe397d0
--- /dev/null
+++ b/usp-2.fig
@@ -0,0 +1,26 @@
+#FIG 3.2  Produced by xfig version 3.2.6a
+Landscape
+Center
+Metric
+A4
+100.00
+Single
+-2
+1200 2
+0 32 #888888
+6 1395 -5310 5535 -3780
+4 0 0 100 -1 2 20 0.0000 4 300 4140 1395 -5085 Working tree is never dirtied\001
+4 0 0 100 -1 2 20 0.0000 4 300 3195 1800 -4275 - by metadata conflicts\001
+4 0 0 100 -1 2 20 0.0000 4 300 3060 1800 -4680 - by patch application\001
+4 0 0 100 -1 2 20 0.0000 4 300 2415 1800 -3870 - by patch export\001
+-6
+2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5
+        1080 -270 12510 -270 12510 -8055 1080 -8055 1080 -270
+4 0 0 100 -1 2 20 0.0000 4 225 3885 1395 -6840 No need to switch branches\001
+4 0 0 100 -1 2 20 0.0000 4 300 5490 1395 -6450 Tree is always dpkg-buildpackage'able\001
+4 0 0 100 -1 2 18 0.0000 4 255 3465 3600 -5985 ... unlike gbp pq and git-dpm\001
+4 0 0 100 -1 2 20 0.0000 4 300 3345 1350 -2700 No reading diffs of diffs\001
+4 0 0 100 -1 2 18 0.0000 4 255 1920 5310 -4680 ... unlike gbp pq\001
+4 0 0 100 -1 2 18 0.0000 4 255 1920 5265 -3870 ... unlike gbp pq\001
+4 0 0 100 -1 2 18 0.0000 4 255 1920 5265 -2700 ... unlike gbp pq\001
+4 0 0 100 -1 16 24 0.0000 4 390 5310 1350 -7740 git-debrebase - features (2/3)\001