Skip to content

switch-config tag=<tag> #367

@joaobrittoneto

Description

@joaobrittoneto

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?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions