From: Ian Jackson Date: Tue, 18 Aug 2015 07:44:44 +0000 (+0100) Subject: last minute update X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?p=talk-2015-debconf-dgit.git;a=commitdiff_plain;h=fa9a66657c2c0c4fd951796e5114f681c1667359 last minute update --- diff --git a/fmt-status.fig b/fmt-status.fig index a6a95f2..25d57d8 100644 --- a/fmt-status.fig +++ b/fmt-status.fig @@ -8,26 +8,35 @@ Single -2 1200 2 0 32 #ffddaa -6 720 4860 1530 5670 -4 0 0 50 -1 16 20 0.0000 4 225 450 720 5130 3.0\001 -4 0 0 50 -1 16 20 0.0000 4 315 810 720 5520 (quilt)\001 +6 675 5175 11700 8325 +6 720 5310 1530 6120 +4 0 0 50 -1 16 20 0.0000 4 225 450 720 5580 3.0\001 +4 0 0 50 -1 16 20 0.0000 4 315 810 720 5970 (quilt)\001 -6 -6 720 6570 1530 7380 -4 0 0 50 -1 16 20 0.0000 4 225 450 720 6840 3.0\001 -4 0 0 50 -1 16 20 0.0000 4 315 810 720 7230 (quilt)\001 +6 720 7020 1530 7830 +4 0 0 50 -1 16 20 0.0000 4 225 450 720 7290 3.0\001 +4 0 0 50 -1 16 20 0.0000 4 315 810 720 7680 (quilt)\001 +-6 +4 0 4 50 -1 16 20 0.0000 4 300 2490 6300 5670 Watch this space\001 +4 0 4 50 -1 16 18 0.0000 4 270 2175 6300 7560 Watch this space\001 +4 0 4 50 -1 16 18 0.0000 4 270 1245 6300 6210 problems:\001 +4 0 4 50 -1 16 18 0.0000 4 270 3750 7740 6210 patches applied vs. unapplied\001 +4 0 4 50 -1 14 18 0.0000 4 240 1650 7650 6660 .gitignore\001 +4 0 4 50 -1 14 18 0.0000 4 240 1650 7560 8100 .gitignore\001 +4 0 4 50 -1 16 18 0.0000 4 270 1245 6300 8100 problems:\001 +4 0 0 50 -1 14 20 0.0000 4 270 3120 2700 5670 git-buildpackage\001 +4 0 0 50 -1 14 20 0.0000 4 270 1365 2700 7560 git-dpm\001 -6 2 1 0 2 0 7 50 -1 -1 4.500 0 0 -1 0 0 2 450 1530 11970 1530 -2 1 0 2 0 7 50 -1 -1 4.500 0 0 -1 0 0 2 - 450 4590 11970 4590 2 1 0 2 0 7 50 -1 -1 4.500 0 0 -1 0 0 2 5940 720 5940 7650 +2 1 0 2 0 7 50 -1 -1 4.500 0 0 -1 0 0 2 + 450 4950 11970 4950 4 0 0 50 -1 16 20 0.0000 4 240 1410 720 2070 1.0 native\001 4 0 0 50 -1 16 20 0.0000 4 240 975 720 2700 1.0 diff\001 4 0 0 50 -1 16 20 0.0000 4 300 705 6300 1350 push\001 4 0 0 50 -1 16 20 0.0000 4 240 975 720 3330 1.0 diff\001 -4 0 0 50 -1 14 20 0.0000 4 270 585 2700 2070 git\001 -4 0 0 50 -1 14 20 0.0000 4 270 1755 2700 2700 git-merge\001 4 0 0 50 -1 14 20 0.0000 4 270 1950 2700 3330 git-rebase\001 4 0 0 50 -1 14 20 0.0000 4 270 1755 8100 2070 dgit pull\001 4 0 0 50 -1 14 20 0.0000 4 270 1755 8100 2700 dgit pull\001 @@ -42,12 +51,8 @@ Single 4 0 0 50 -1 16 20 0.0000 4 315 2550 8370 4140 (will be improved)\001 4 0 0 50 -1 14 20 0.0000 4 270 3315 8100 3690 git-merge -s ours\001 4 0 0 50 -1 14 20 0.0000 4 270 2145 8100 3330 dgit fetch;\001 -4 0 4 50 -1 16 20 0.0000 4 300 2490 6300 5220 Watch this space\001 -4 0 4 50 -1 16 18 0.0000 4 270 2175 6300 7110 Watch this space\001 -4 0 4 50 -1 16 18 0.0000 4 270 1245 6300 5760 problems:\001 -4 0 4 50 -1 16 18 0.0000 4 270 3750 7740 5760 patches applied vs. unapplied\001 -4 0 4 50 -1 14 18 0.0000 4 240 1650 7650 6210 .gitignore\001 -4 0 4 50 -1 14 18 0.0000 4 240 1650 7560 7650 .gitignore\001 -4 0 4 50 -1 16 18 0.0000 4 270 1245 6300 7650 problems:\001 -4 0 0 50 -1 14 20 0.0000 4 270 3120 2700 5220 git-buildpackage\001 -4 0 0 50 -1 14 20 0.0000 4 270 1365 2700 7110 git-dpm\001 +4 0 0 50 -1 16 20 0.0000 4 255 525 2700 2070 any\001 +4 0 0 50 -1 16 20 0.0000 4 315 1995 2700 2700 any (merging)\001 +4 0 0 50 -1 16 20 0.0000 4 315 3060 2700 3825 or any other rebasing\001 +4 0 0 50 -1 16 20 0.0000 4 180 900 8100 4680 or use\001 +4 0 0 50 -1 14 20 0.0000 4 270 2730 9180 4680 git-import-dsc\001