mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better name for difference file

Browse source
This commit is contained in:
Joey Hess 2015-01-27 13:27:12 -04:00
parent 4a93d5c1f7
commit 51fc3014c6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/design/v6.mdwn
View file

@ -193,27 +193,27 @@ case hashing.
## concrete design ## concrete design
Make git-annex:version be used by newer git-annex versions than v5, Make git-annex:difference.log be used by newer git-annex versions than v5,
and by nonstandard configurations. and by nonstandard configurations.
The file contents will be "timestamp uuid [value, ..]", where value is a The file contents will be "timestamp uuid [value, ..]", where value is a
serialized data type that describes divergence from v5 (since v5 and older serialized data type that describes divergence from v5 (since v5 and older
don't have the git-annex:version file). don't have the git-annex:difference.log file).
So, for example, "[Version 6]" could indicate that v6 is being used. Or, So, for example, "[Version 6]" could indicate that v6 is being used. Or,
"[ObjectHashLower True, ObjectHashDirectories 1, BranchHashDirectories 1]" "[ObjectHashLower True, ObjectHashDirectories 1, BranchHashDirectories 1]"
indicate a nonstandard configuration on top of v5 (this might turn out to indicate a nonstandard configuration on top of v5 (this might turn out to
be identical to v6; just make the compare equal and no problem). be identical to v6; just make the compare equal and no problem).
git-annex merge would check if it's merging in a git-annex:version from git-annex merge would check if it's merging in a git-annex:difference.log from
another repo that doesn't match the git-annex:version of the local repo, another repo that doesn't match the git-annex:difference.log of the local repo,
and abort. git-annex sync (and the assistant) would check the same, but and abort. git-annex sync (and the assistant) would check the same, but
before merging master branches either, to avoid a bad merge there. before merging master branches either, to avoid a bad merge there.
The git-annex:version of a local repo could be changed by an upgrade The git-annex:difference.log of a local repo could be changed by an upgrade
or some sort of transition. When this happens, the new value is written or some sort of transition. When this happens, the new value is written
for the uuid of the local repo. git-annex merge would then refuse to merge for the uuid of the local repo. git-annex merge would then refuse to merge
with remote repos until they were also transitioned to the new version. with remote repos until they were also transitioned.
(There's perhaps some overlap here with the existing (There's perhaps some overlap here with the existing
git-annex:transitions.log, however the current transitions involve git-annex:transitions.log, however the current transitions involve