diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-08-31 15:41:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-08-31 15:47:23 -0400 |
| commit | c9629ab97875721c8d36bdaceec25768de610b5e (patch) | |
| tree | b6a5284cd81765d5097d16b2bad64534e7e3d9bd /doc/internals.mdwn | |
| parent | a7383bc94e41d94e77e67406e1a4085d34241bfc (diff) | |
implement export.log and resolve export conflicts
Incremental export updates work now too.
This commit was sponsored by Anthony DeRobertis on Patreon.
Diffstat (limited to 'doc/internals.mdwn')
| -rw-r--r-- | doc/internals.mdwn | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/internals.mdwn b/doc/internals.mdwn index 7d39b1068..4b24ce443 100644 --- a/doc/internals.mdwn +++ b/doc/internals.mdwn @@ -185,8 +185,12 @@ content expression. Tracks what trees have been exported to special remotes by [[git-annex-export]](1). -Each line starts with a timestamp, then the uuid of the special remote, -followed by the sha1 of the tree that was exported to that special remote. +Each line starts with a timestamp, then the uuid of the repository +that exported to the special remote, followed by the sha1 of the tree +that was exported, and then by the uuid of the special remote. For example: + + 1317929189.157237s e605dca6-446a-11e0-8b2a-002170d25c55 bb08b1abd207aeecccbc7060e523b011d80cb35b 26339d22-446b-11e0-9101-002170d25c55 + 1317923000.251111s e605dca6-446a-11e0-8b2a-002170d25c55 7c7af825782b7c8706039b855c72709993542be4 26339d22-446b-11e0-9101-002170d25c55 (The exported tree is also grafted into the git-annex branch, at `export.tree`, to prevent git from garbage collecting it. However, the head |