Bug 457124 - Untracked files prevents switching branches
Summary: Untracked files prevents switching branches
Status: RESOLVED MOVED
Alias: None
Product: kdesrc-build
Classification: Developer tools
Component: general (show other bugs)
Version: Git
Platform: Other Linux
: NOR normal
Target Milestone: ---
Assignee: Michael Pyne
URL:
Keywords: usability
Depends on:
Blocks:
 
Reported: 2022-07-25 16:14 UTC by David Faure
Modified: 2024-03-06 10:07 UTC (History)
2 users (show)

See Also:
Latest Commit:
Version Fixed In:
Sentry Crash Report:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description David Faure 2022-07-25 16:14:31 UTC
SUMMARY

I'm using kdesrc-build with stable-kf5-qt5 branch group. It told me this today:

Updating akonadi-calendar (to branch release/22.08)
 * The module akonadi-calendar had local changes from a different branch than expected:
 *   Expected branch: New branch to point to origin/release/22.08
 *   Actual branch:   release/22.04
 *
 * To avoid conflict with your local changes, akonadi-calendar will not be updated, and the
 * branch will remain unchanged, so it may be out of date from upstream.

        * You had local changes to akonadi-calendar, which have been re-applied.
        akonadi-calendar update complete, 0 files affected.

STEPS TO REPRODUCE
1. Create a text file locally (e.g. some log or diff) in a repository
2. Change the branch for that repo in kdesrc-build's config
3. kdesrc-build --src-only

OBSERVED RESULT
It refuses to switch branches

EXPECTED RESULT
It should switch branches just fine, there's no reason for an irrelevant local file to prevent that

SOFTWARE/OS VERSIONS
kdesrc-build 22.01
Comment 1 Andrew Shark 2024-03-06 10:07:16 UTC
Move to https://invent.kde.org/sdk/kde-builder/-/issues/72