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

sync in view branch updates the view branch

Browse source 
* sync: When run in a view branch, refresh the view branch to reflect any
    changes that have been made to the parent branch or metadata.

This is basically working, but probably needs some more work to deal with
all the edge cases of things sync does.

Sponsored-by: Lawrence Brogan on Patreon
This commit is contained in:
Joey Hess 2023-02-08 15:37:28 -04:00
parent a11d6e0baf
commit 5f9bf51438
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 115 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
doc/todo/Metadata_changes_are_not_reflected_in_a_view/comment_4_6ab0e38d8be8a70d501108f207d41d82._comment Normal file
View file

@ -0,0 +1,29 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2023-02-08T19:32:34Z"
content="""
`git-annex sync` when in a view branch will now update it.
Leaving this open for optimising it.
Also because of this problem:
joey@darkstar:~/tmp/m#master(author=_)>git-annex sync
commit
On branch views/master(author=_)
nothing to commit, working tree clean
ok
merge synced/master
fatal: refusing to merge unrelated histories
failed
Looks like it should not be trying to merge the synced/master
branch into the view branch. But, this makes me wonder, does the master branch
get updated with new files pulled from remotes? If not, the view branch
won't be updated to have them either.
Also, I think that it may try to import trees from importree special remotes,
into the view branch. Perhaps those should also get imported but merged into
the master branch...
"""]]