diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-08 08:01:51 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-08 08:01:51 +0000 |
| commit | b95ff2dface351406bcf55ed8b5ea1f5f493da18 (patch) | |
| tree | 23799f4c6662c55c15cf54a748dad8beea2487c6 /bubba.txt | |
| parent | 2023-05-08T07:45:01Z (diff) | |
| download | repos-b95ff2dface351406bcf55ed8b5ea1f5f493da18.tar.gz repos-b95ff2dface351406bcf55ed8b5ea1f5f493da18.tar.bz2 repos-b95ff2dface351406bcf55ed8b5ea1f5f493da18.zip | |
2023-05-08T08:00:02Z
Diffstat (limited to 'bubba.txt')
| -rw-r--r-- | bubba.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/bubba.txt b/bubba.txt index fd70526a2255..5027fb941ef0 100644 --- a/bubba.txt +++ b/bubba.txt @@ -14,29 +14,9 @@ pkgcore 0.12.20 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bubba *** syncing bubba -From https://github.com/gordonb3/bubba-overlay - + 37b6a78...4991211 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 bubba - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bubba -*** syncing bubba -Cloning into '/var/lib/repo-mirror-ci/sync/bubba'... +Already up to date. *** synced bubba - * 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 bubba |