You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Before each synchronization, we need to make sure that the local git references point to the same place as the remote ones.
For instance, if we have this situation:
%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'showCommitLabel': false, 'tagLabelFontSize': '24px', "mainBranchName":"remote/some-branch"}} }%%
gitGraph
commit
commit
branch local/some-branch
checkout local/some-branch
commit type: HIGHLIGHT tag: "Extra commit with a conflict from a previous sync"
checkout remote/some-branch
commit
Loading
Some sync has run and maybe tried to do make new commits on the branch but there were conflicts so the sync ended and left the branch pointing somewhere else than the remote original branch.
Another sync starts and maybe it would try to update the same branch but when we are preparing the local clone, we need to make sure that some-branch points to the same place as the remote (so the tip of the branch where maybe new commits appeared).
Right now, this is not possible - we ask the cloner to prepare VMR with a given remote and a given ref and if the ref is present, we do not force-update it to the same place as the remote.
Goal
We should make the RepositoryCloneManager pull from the origin, find the refs we want and create a local ref pointing to it.
However, we need to put this behaviour behind a flag so that it only triggers in the service. If someone would call darc vmr update locally, we don't want to overwrite that person's local state with remote so it must work like it is working now (only check if we have all the refs).
I think this might be a considerable rewrite of how we clone repos in the service.
The text was updated successfully, but these errors were encountered:
Context
Before each synchronization, we need to make sure that the local git references point to the same place as the remote ones.
For instance, if we have this situation:
Some sync has run and maybe tried to do make new commits on the branch but there were conflicts so the sync ended and left the branch pointing somewhere else than the remote original branch.
Another sync starts and maybe it would try to update the same branch but when we are preparing the local clone, we need to make sure that
some-branch
points to the same place as the remote (so the tip of the branch where maybe new commits appeared).Right now, this is not possible - we ask the cloner to prepare VMR with a given remote and a given ref and if the ref is present, we do not force-update it to the same place as the remote.
Goal
We should make the
RepositoryCloneManager
pull from the origin, find the refs we want and create a local ref pointing to it.However, we need to put this behaviour behind a flag so that it only triggers in the service. If someone would call
darc vmr update
locally, we don't want to overwrite that person's local state with remote so it must work like it is working now (only check if we have all the refs).I think this might be a considerable rewrite of how we clone repos in the service.
The text was updated successfully, but these errors were encountered: