diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-10-27 14:18:17 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-10-27 14:18:17 +0000 |
| commit | d4410c9da11c1930ec6e3902ce43b6b0734e203a (patch) | |
| tree | b20d777b2c6ce7691903b51902c521cf3d689370 /HomeAssistantRepository.txt | |
| parent | 2024-10-27T14:00:00Z (diff) | |
| download | repos-d4410c9da11c1930ec6e3902ce43b6b0734e203a.tar.gz repos-d4410c9da11c1930ec6e3902ce43b6b0734e203a.tar.bz2 repos-d4410c9da11c1930ec6e3902ce43b6b0734e203a.zip | |
2024-10-27T14:15:00Z
Diffstat (limited to 'HomeAssistantRepository.txt')
| -rw-r--r-- | HomeAssistantRepository.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/HomeAssistantRepository.txt b/HomeAssistantRepository.txt index ff4b7652ed15..67ca4d2c2536 100644 --- a/HomeAssistantRepository.txt +++ b/HomeAssistantRepository.txt @@ -17,29 +17,9 @@ pkgcore 0.12.28 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync HomeAssistantRepository *** syncing HomeAssistantRepository -From https://git.edevau.net/onkelbeh/HomeAssistantRepository - + d034bf80c...6415e108a master -> origin/master (forced update) -hint: You have divergent branches and need to specify how to reconcile them. -hint: You can do so by running one of the following commands sometime before -hint: your next pull: -hint: -hint: git config pull.rebase false # merge -hint: git config pull.rebase true # rebase -hint: git config pull.ff only # fast-forward only -hint: -hint: You can replace "git config" with "git config --global" to set a default -hint: preference for all repositories. You can also pass --rebase, --no-rebase, -hint: or --ff-only on the command line to override the configured default per -hint: invocation. -fatal: Need to specify how to reconcile divergent branches. -!!! failed syncing HomeAssistantRepository - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync HomeAssistantRepository -*** syncing HomeAssistantRepository -Cloning into '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository'... +Already up to date. *** synced HomeAssistantRepository - * Sync succeeded after re-adding + * Sync succeeded $ git log --format=%ci -1 $ git show -q --pretty=format:%G? HEAD $ pmaint --config /var/lib/repo-mirror-ci/data/etc/portage regen --use-local-desc --pkg-desc-index -t 32 HomeAssistantRepository |