diff options
Diffstat (limited to 'doc/design')
| -rw-r--r-- | doc/design/exporting_trees_to_special_remotes.mdwn | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/design/exporting_trees_to_special_remotes.mdwn b/doc/design/exporting_trees_to_special_remotes.mdwn index 9327b475f..39c291c54 100644 --- a/doc/design/exporting_trees_to_special_remotes.mdwn +++ b/doc/design/exporting_trees_to_special_remotes.mdwn @@ -206,15 +206,15 @@ there would be a merge conflict. Union merging would *scramble* the exported tree, so even if a smart merge is added, old versions of git-annex would corrupt the exported tree. -To avoid that problem, add a log file `exported/uuid.log` that lists -the sha1 of the exported tree and the uuid of the repository that exported it. +To avoid that problem, add a log file `export.log` that contains the uuid +of the remote that was exported to, and the sha1 of the exported tree. To avoid the exported tree being GCed, do graft it in to the git-annex branch, but follow that with a commit that removes the tree again, and only update `refs/heads/git-annex` after making both commits. -If `exported/uuid.log` contains multiple active exports, there was an -export conflict. Short of downloading the whole export to checksum it, -or deleting the whole export, what can be done to resolve it? +If `export.log` contains multiple active exports of different trees, +there was an export conflict. Short of downloading the whole export to +checksum it, or deleting the whole export, what can be done to resolve it? In this case, git-annex knows both exported trees. Have the user provide a tree that resolves the conflict as they desire (it could be the same as |