diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-09-11 18:05:49 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-09-11 18:05:49 +0000 |
| commit | 23fc8450ff1da99eadd3c6dfd285cbfa992f7d86 (patch) | |
| tree | 3367e2c998efe8a72ee892fbbe4262928046355d /linux-surface.txt | |
| parent | 2024-09-11T17:45:00Z (diff) | |
| download | repos-23fc8450ff1da99eadd3c6dfd285cbfa992f7d86.tar.gz repos-23fc8450ff1da99eadd3c6dfd285cbfa992f7d86.tar.bz2 repos-23fc8450ff1da99eadd3c6dfd285cbfa992f7d86.zip | |
2024-09-11T18:00:00Z
Diffstat (limited to 'linux-surface.txt')
| -rw-r--r-- | linux-surface.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/linux-surface.txt b/linux-surface.txt index c950425ca7e0..b0cd03f3ee51 100644 --- a/linux-surface.txt +++ b/linux-surface.txt @@ -16,29 +16,9 @@ pkgcore 0.12.27 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync linux-surface *** syncing linux-surface -From https://github.com/jasisonee/linux-surface-overlay - + fb58805...40eb2a3 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 linux-surface - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync linux-surface -*** syncing linux-surface -Cloning into '/var/lib/repo-mirror-ci/sync/linux-surface'... +Already up to date. *** synced linux-surface - * 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 linux-surface |