diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-10-05 16:31:38 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-10-05 16:31:38 +0000 |
| commit | 0be3c7a37bdb880e24152db350e488246f92cfa3 (patch) | |
| tree | fc2e9eda5d9542de49d79976310ae957d128d1d1 /oxen-overlay.txt | |
| parent | 2022-10-05T16:15:01Z (diff) | |
| download | repos-0be3c7a37bdb880e24152db350e488246f92cfa3.tar.gz repos-0be3c7a37bdb880e24152db350e488246f92cfa3.tar.bz2 repos-0be3c7a37bdb880e24152db350e488246f92cfa3.zip | |
2022-10-05T16:30:01Z
Diffstat (limited to 'oxen-overlay.txt')
| -rw-r--r-- | oxen-overlay.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/oxen-overlay.txt b/oxen-overlay.txt index d8d2e1e7f9cb..6acc0ab8c79d 100644 --- a/oxen-overlay.txt +++ b/oxen-overlay.txt @@ -15,29 +15,9 @@ pkgcore 0.12.13 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync oxen-overlay *** syncing oxen-overlay -From https://github.com/xutaxkamay/gentoo-oxen - + ebc1e0c...83e7c82 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 oxen-overlay - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync oxen-overlay -*** syncing oxen-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/oxen-overlay'... +Already up to date. *** synced oxen-overlay - * 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 oxen-overlay |