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

close not a bug

Browse source
This commit is contained in:
Joey Hess 2021-07-13 14:00:19 -04:00
commit ca8f39295f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/sync_merges_local-to-repo_adjusted_branch.mdwn
View file

@ -15,3 +15,5 @@ Given that repo1 and repo2 both have a branch adjusted/master(hidemissing), thos
+ 20bcd18...170148a adjusted/master(hidemissing) -> WD250G/adjusted/master(hidemissing) (forced update)
a071f8c..4a1f6d3 git-annex -> WD250G/git-annex
pull WD250G ok
> [[not a bug|done]] --[[Joey]]

26
doc/bugs/sync_merges_local-to-repo_adjusted_branch/comment_2_36561048dd9e94721ec14a8c36c203f2._comment Normal file
View file

@ -0,0 +1,26 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2021-07-13T17:27:57Z"
content="""
Like Lukey said, your output does not show branches being "forcibly merged". What it shows
is `git fetch WD250G` running and fetching a
"WD250G/adjusted/master(hidemissing)" ref. That updates a previous version
of that it fetched from the remote before.
Nothing else will be done with that ref, as far as I can see. It's just
being maintained by git as a remote tracking branch, the same as it would
keep track of any other branch that happened to be on the remote.
You can configure git to not fetch this or other branches, by
changing the remote.WD250G.fetch git config.
Now, what `git annex sync` does do, when in an adjusted branch, is
propigate any changes that you have made to that branch back to the master
branch, and then it pushes the master branch over to the remote. And if the
remote is also in an adjusted branch, then running `git annex sync` on
the remote will merge in those changes from the master branch. But
when the branch is a --hide-missing branch, this process does not cause
files that are missing on the one repo to get deleted from the branch on
the other repo.
"""]]