summaryrefslogtreecommitdiff
path: root/doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.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/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.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/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn')
-rw-r--r--doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn36
1 files changed, 0 insertions, 36 deletions
diff --git a/doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn b/doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn
deleted file mode 100644
index a84d8cb56..000000000
--- a/doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn
+++ /dev/null
@@ -1,36 +0,0 @@
-Since uuid.log, trust.log and remote.log are union merged, it's possible
-for any given item in them to have multiple values after a merge.
-This would happen, for example, if the value was changed in different ways
-in two repos which were then merged. git-annex will use an arbitrary
-one of the multiple values.
-
-A workaround if this should happen to you is to use `git annex describe`
-or other commands to re-set the value you want. The process of setting
-the value will remove the multiple lines.
-
-To fix this the file format needs to be changed to include a timestamp
-as is done with the other log files, then git-annex can consistently
-pick the newest value -- which is as close to the "right" value as can be
-determined in this situation.
-
-----
-
-File format backwards-compatability is the issue. Ideally, old git-annex
-would keep working, ignoring the timestamp.
-
-- uuid.log: "uuid description timestamp" would work; old git-annex
- would just treat the timestamp as part of the description which would be
- ok
- > update: converted! --[[Joey]]
-- trust.log: "uuid trustlevel timestamp" would work; old git-annex
- ignores trailing words
- > update: converted! --[[Joey]]
-- remote.log: "uuid key=value ... timestamp" is on the edge but does work
- (old git-annex will include the timestamp in the key/value map it builds,
- but that should not break anything really)
- > update: converted! --[[Joey]]
-
-Appending "timestamp=xxxxx" would be good for clarity, and make
-it easier to parse the timestamp out from lines that have it.
-
-> [[done]] --[[Joey]]