summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-20 18:49:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-20 18:49:37 -0400
commita735620ff74f07b87c5c3a85b30c2fefc17634ce (patch)
tree8413b5acaf088faa00e66d1333149d10e4f7aff0
parent18c389f029100faca9e23b1c3a2ff710d4d85761 (diff)
blog for the day
-rw-r--r--doc/design/assistant/blog/day_269__bugfixes.mdwn14
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/design/assistant/blog/day_269__bugfixes.mdwn b/doc/design/assistant/blog/day_269__bugfixes.mdwn
new file mode 100644
index 000000000..7cbdb5863
--- /dev/null
+++ b/doc/design/assistant/blog/day_269__bugfixes.mdwn
@@ -0,0 +1,14 @@
+Worked on several important bug fixes today. One affects automatic merge
+confict resolution, and can case data loss in direct mode, so I will be
+making a release with the fix tomorrow.
+
+Practiced TDD today, and good thing too. The new improved test suite
+turned up a really subtle bug involving the git-annex branch vector
+clocks-ish code, which I also fixed.
+
+Also, fixes to the OSX autobuilds. One of them had a broken gpg, which is
+now fixed. The other one is successfully building again. And, I'm switching
+the Linux autobuilds to build against Debian stable, since testing has a
+new version of libc now, which would make the autobuilds not work on older
+systems. Getting an amd64 chroot into shape is needing rather a lot
+of backporting of build dependencies, which I already did for i386.