summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-09 14:20:34 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-09 14:20:34 -0400
commit618caf2765803eb50ebae67b2e04a3f6055ce883 (patch)
treecde5e8ed831710016e2db6edd3287605fa091ddb
parent35ffe77794eaabf2e99b28dbc30499f7c6af8d62 (diff)
devblog
-rw-r--r--doc/devblog/day_379__bugs_race_conditions_and_taxes.mdwn12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/devblog/day_379__bugs_race_conditions_and_taxes.mdwn b/doc/devblog/day_379__bugs_race_conditions_and_taxes.mdwn
new file mode 100644
index 000000000..3d323d2d4
--- /dev/null
+++ b/doc/devblog/day_379__bugs_race_conditions_and_taxes.mdwn
@@ -0,0 +1,12 @@
+Think I'm really finished with adjusted branches now. Fixed a bug in
+annex symlink calculation when merging into an adjusted branch. And, fixed
+a race condition involving a push of master from another repository.
+
+While `git annex adjust --unlock` is reason enough to have adjusted
+branches, I do want to at some point look into implementing `git annex
+adjust --hide-missing`, and perhaps rewrite the view branches to use
+adjusted branches, which would allow for updating view branches when
+pulling from a remote.
+
+Also, turns out Windows supports hard links, so I got annex.thin working
+on Windows, as well as a few other things that work better with hard links.