diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-06 15:31:25 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-06 15:31:25 -0400 |
| commit | 3e0d2a080333f3566312da0e1982739873603457 (patch) | |
| tree | f168ffd2f7cd18f1070f7e18f6e6d8694cbd27a3 /doc | |
| parent | 52fa4096480ba74c355dffcddbda766994f4d5b7 (diff) | |
add timestamp to uuid.log
* New or changed repository descriptions in uuid.log now have a timestamp,
which is used to ensure the newest description is used when the uuid.log
has been merged.
* Note that older versions of git-annex will display the timestamp as part
of the repository description, which is ugly but otherwise harmless.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/uuid.log_trust.log_and_remote.log_merge_wackiness.mdwn | 1 | ||||
| -rw-r--r-- | doc/internals.mdwn | 6 |
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` |