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

thought

Browse source
This commit is contained in:
Joey Hess 2020-07-03 12:02:07 -04:00
parent 8ca0cdb0ac
commit a8099b9896
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
doc/todo/importing_from_special_remote_without_downloading/comment_6_a04159b9c052e61483757ad69ba989db._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="joey"
subject="""comment 6"""
date="2020-07-03T15:52:26Z"
content="""
This has merge conflict potential, because the key generated by import
--fast is probably not be the same one generated by a regular import. So, if
two repositories are both importing from the same special remote, there will be
a need to resolve the resulting merge conflicts.
Since git-annex sync is often run with and without --content, it's probably
the most likely problem point for this. Perhaps there should be another
config that controls whether sync does a fast import or not, and not
control it with --content?
"""]]