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

thought

Browse source
This commit is contained in:
Joey Hess 2023-06-23 14:30:37 -04:00
parent 941cd7cfaa
commit 388804b785
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/todo/drop_from_export_remote.mdwn
View file

@ -18,4 +18,14 @@ This seems like a prerequisite for [[remove_legacy_import_directory_interface]]
`git-annex import --deduplicate` and `--clean-duplicates` need to remove individual files
from the remote.
> Note that doing this with an importtree=yes remote would
> result, after import, in the remote tracking branch having the file
> deleted. That could be surprising when merged, since it would delete
> the file from master!
>
> I think this problem can be avoided by rewriting the remote tracking
> branch's previous commit to not include the file that got deleted. Then
> merging would need --allow-unrelated-histories, but would not cause the
> file to be deleted from master.
[[!tag confirmed]]