summaryrefslogtreecommitdiff
path: root/doc/todo/avoid_unnecessary_union_merges.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-05-29 15:23:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-05-29 15:23:05 -0400
commit1f6cfecc972b121fa42ea80383183bbaccc2195a (patch)
tree0a450c4226f5e05c2a3597a9f520376de281fffe /doc/todo/avoid_unnecessary_union_merges.mdwn
parenta95fb731cd117f35a6e0fce90d9eb35d0941e26e (diff)
remove old closed bugs and todo items to speed up wiki updates and reduce size
Remove closed bugs and todos that were least edited before 2014. Command line used: for f in $(grep -l '\[\[done\]\]' *.mdwn); do if [ -z $(git log --since=2014 --pretty=oneline "$f") ]; then git rm $f; git rm -rf $(echo "$f" | sed 's/.mdwn$//'); fi; done
Diffstat (limited to 'doc/todo/avoid_unnecessary_union_merges.mdwn')
-rw-r--r--doc/todo/avoid_unnecessary_union_merges.mdwn20
1 files changed, 0 insertions, 20 deletions
diff --git a/doc/todo/avoid_unnecessary_union_merges.mdwn b/doc/todo/avoid_unnecessary_union_merges.mdwn
deleted file mode 100644
index 5cd4b6437..000000000
--- a/doc/todo/avoid_unnecessary_union_merges.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-Some commands cause a union merge unnecessarily. For example, `git annex add`
-modifies the location log, which first requires reading the current log (if
-any), which triggers a merge.
-
-Would be good to avoid these unnecessary union merges. First because it's
-faster and second because it avoids a possible delay when a user might
-ctrl-c and leave the repo in an inconsistent state. In the case of an add,
-the file will be in the annex, but no location log will exist for it (fsck
-fixes that).
-
-It may be that all that's needed is to modify Annex.Branch.change
-to read the current value, without merging. Then commands like `get`, that
-query the branch, will still cause merges, and commands like `add` that
-only modify it, will not. Note that for a command like `get`, the merge
-occurs before it has done anything, so ctrl-c should not be a problem
-there.
-
-This is a delicate change, I need to take care.. --[[Joey]]
-
-> [[done]] (assuming I didn't miss any cases where this is not safe!) --[[Joey]]