From a8099b9896db9a4cb1c1815d882fa4bbcccde613 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 3 Jul 2020 12:02:07 -0400 Subject: [PATCH] thought --- ...nt_6_a04159b9c052e61483757ad69ba989db._comment | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/todo/importing_from_special_remote_without_downloading/comment_6_a04159b9c052e61483757ad69ba989db._comment diff --git a/doc/todo/importing_from_special_remote_without_downloading/comment_6_a04159b9c052e61483757ad69ba989db._comment b/doc/todo/importing_from_special_remote_without_downloading/comment_6_a04159b9c052e61483757ad69ba989db._comment new file mode 100644 index 0000000000..cbfb7039b5 --- /dev/null +++ b/doc/todo/importing_from_special_remote_without_downloading/comment_6_a04159b9c052e61483757ad69ba989db._comment @@ -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? +"""]]