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

todo

Browse source
This commit is contained in:
Joey Hess 2018-11-13 15:49:22 -04:00
parent e2589670da
commit 6a0618f7b3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/todo/more_efficient_resolution_of_trivial_export_conflicts.mdwn Normal file
View file

@ -0,0 +1,16 @@
Export conflicts happen whenever two repos export different trees
to the same special remote.
Some conflicts that seem trivial currently involve unncessary unexporting
and re-uploading in their resolution.
For example, if A exports a tree containing `[foo]`, and B exports a tree
containing `[foo, bar]`, bar gets unexported when resolving the conflict.
Bear in mind that A could have first exported a tree containing `[foo, bar]`
then B exported a tree containing `[foo, bar]`, and then A exported
`[foo]`, so unexported bar.
So, if one exported tree is a subset of the other, it's not necessary to
unexport files added by the other tree. It's sufficient to check that files
are present in the export and upload any that are missing. --[[Joey]]