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

update

Browse source
This commit is contained in:
Joey Hess 2012-12-19 12:47:23 -04:00
parent 93c430c2a4
commit 62e15d824c
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/design/assistant/desymlink.mdwn
View file

@ -87,6 +87,9 @@ is converted to a real file when it becomes present.
* Deal with files changing as they're being transferred from a direct mode * Deal with files changing as they're being transferred from a direct mode
repository to another git repository. The remote repo currently will repository to another git repository. The remote repo currently will
accept the bad data and update the location log to say it has the key. accept the bad data and update the location log to say it has the key.
## done
* `git annex sync` updates the key to files mappings for files changed, * `git annex sync` updates the key to files mappings for files changed,
but needs much other work to handle direct mode: but needs much other work to handle direct mode:
* Generate git commit, without running `git commit`, because it will * Generate git commit, without running `git commit`, because it will
@ -104,4 +107,4 @@ is converted to a real file when it becomes present.
repo, replace the symlink with the direct file (either moving out repo, replace the symlink with the direct file (either moving out
of `.git/annex/objects/` or hard-linking if the same key is present of `.git/annex/objects/` or hard-linking if the same key is present
elsewhere in the tree. **done** elsewhere in the tree. **done**
* handle merge conflicts on direct mode files * handle merge conflicts on direct mode files **done**