summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn1
-rw-r--r--doc/internals.mdwn6
2 files changed, 4 insertions, 3 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
index 2724611fb..5a703b2cb 100644
--- 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
@@ -21,6 +21,7 @@ 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
- remote.log: "uuid key=value ... timestamp" is on the edge but does work
diff --git a/doc/internals.mdwn b/doc/internals.mdwn
index e80ecbac0..4881588ca 100644
--- a/doc/internals.mdwn
+++ b/doc/internals.mdwn
@@ -42,10 +42,10 @@ more useful than a UUID when it refers to a repository that does not have
a configured git remote pointing at it.
The file format is simply one line per repository, with the uuid followed by a
-space and then the description through to the end of the line. Example:
+space and then the description, followed by a timestamp. Example:
- e605dca6-446a-11e0-8b2a-002170d25c55 laptop
- 26339d22-446b-11e0-9101-002170d25c55 usb disk
+ e605dca6-446a-11e0-8b2a-002170d25c55 laptop timestamp=1317929189.157237s
+ 26339d22-446b-11e0-9101-002170d25c55 usb disk timestamp=1317929330.769997s
## `remotes.log`