diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-07-24 22:01:30 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-07-24 22:01:30 +0000 |
| commit | aebd034e51b7e15fb75e285b9de67afcb1a67c58 (patch) | |
| tree | 366bffcdb98a17104ca8c66c407f974784e2383a /stowe-verlay.txt | |
| parent | 2022-07-24T21:45:01Z (diff) | |
| download | repos-aebd034e51b7e15fb75e285b9de67afcb1a67c58.tar.gz repos-aebd034e51b7e15fb75e285b9de67afcb1a67c58.tar.bz2 repos-aebd034e51b7e15fb75e285b9de67afcb1a67c58.zip | |
2022-07-24T22:00:01Z
Diffstat (limited to 'stowe-verlay.txt')
| -rw-r--r-- | stowe-verlay.txt | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/stowe-verlay.txt b/stowe-verlay.txt index 06134aebebcb..6069f732df57 100644 --- a/stowe-verlay.txt +++ b/stowe-verlay.txt @@ -14,9 +14,29 @@ pkgcore 0.12.11 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stowe-verlay *** syncing stowe-verlay -Already up to date. +From https://github.com/mwstowe/stowe-verlay + + 433977d...9586a6d 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 stowe-verlay + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync stowe-verlay +*** syncing stowe-verlay +Cloning into '/var/lib/repo-mirror-ci/sync/stowe-verlay'... *** synced stowe-verlay - * Sync succeeded + * Sync succeeded after re-adding $ 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 stowe-verlay |