Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch-config tag=<tag> #367

Open
joaobrittoneto opened this issue Feb 15, 2022 · 0 comments
Open

switch-config tag=<tag> #367

joaobrittoneto opened this issue Feb 15, 2022 · 0 comments

Comments

@joaobrittoneto
Copy link

I have no problem in doing autoproj switch_config branch=<branch>.

But when I try to do autoproj switch_config tag=<tag> I usually get the following error:

autoproj main configuration(<project>/autoproj): failed in import phase
    the local branch 'master' and the remote branch master of autoproj main configuration have diverged, and I therefore refuse to update automatically. Go into <project>/autoproj and either reset the local branch or merge the remote changes

Afterwards, I can do aup --reset and it seems to work without a problem (the local master branch is on the tag).

The tag in the buildconf (<project>/autoproj) just contains a snapshot of the state of the packages.
I have no problem in doing git merge <tag> from the master branch

Not sure if this is the proper solution, but would be possible to have a --force flag in switch_config to avoid this error?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant