diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-21 20:31:45 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-05-21 20:31:45 +0000 |
| commit | 90c84b4c4ff4186bd5215ed4b9f1e69510396bcf (patch) | |
| tree | cb6ee70e0bb8f3fe6b427e8faa20d399e049baed /jjakob.txt | |
| parent | 2023-05-21T20:15:01Z (diff) | |
| download | repos-90c84b4c4ff4186bd5215ed4b9f1e69510396bcf.tar.gz repos-90c84b4c4ff4186bd5215ed4b9f1e69510396bcf.tar.bz2 repos-90c84b4c4ff4186bd5215ed4b9f1e69510396bcf.zip | |
2023-05-21T20:30:01Z
Diffstat (limited to 'jjakob.txt')
| -rw-r--r-- | jjakob.txt | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/jjakob.txt b/jjakob.txt index 69de0edee0c1..cfb1ff01b6cc 100644 --- a/jjakob.txt +++ b/jjakob.txt @@ -16,30 +16,9 @@ pkgcore 0.12.20 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jjakob WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing jjakob -From https://github.com/jjakob/gentoo-overlay - + 8e96849...6e18d1c 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 jjakob - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync jjakob -WARNING:pkgcore:menelkir repo at '/var/lib/repo-mirror-ci/sync/menelkir', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -*** syncing jjakob -Cloning into '/var/lib/repo-mirror-ci/sync/jjakob'... +Already up to date. *** synced jjakob - * 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 jjakob |