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

use disconnected history for import tracking branch

Browse source 
This avoids the first merge from it deleting all files in the current
branch, which was very surpring and unwanted behavior.
This commit is contained in:
Joey Hess 2019-03-01 14:32:45 -04:00
parent 740f957cef
commit d28b0a8bd0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 27 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

18
doc/todo/import_tree.mdwn
View file

@ -21,24 +21,6 @@ this.
* export needs to use storeExportWithContentIdentifierM for importtree=yes
remotes
* Merging the first import from a remote currently removes all local
files that are not present in the remote. But subsequent imports from the
remote do not delete newly added local files when merged. This seems
inconsistent and very surprising to the user.
It happens because the remote tracking branch currently starts
from the local branch, and then has a commit added to it that contains
all files in the remote (and thus deletes the local files).
A subsequent import extents the tracking branch by another commit, so
merging that does not re-do the deletion.
One fix would be to start the remote tracking branch not with the local
branch. Reflecting it being a perhaps entirely separate line of
development. Unless git-annex export were used first, and updated the
tracking branch, then the branch would start with what's exported, which
is fine. The downside of this is that git merge --allow-unrelated-histories
is needed to merge that unrelated history.
* export needs to update the tracking branch with what it exported
* "git annex import master --from rmt" followed by "git annex import master:sub --from rmt"