diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-10-20 11:01:43 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-10-20 11:01:43 +0000 |
| commit | 53e6b72ba7a4ed1fd590db59fce81da55e8934cc (patch) | |
| tree | 45436e0f36ee804fe51d6a04b66d94089af7f652 /bobwya.txt | |
| parent | 2023-10-20T10:45:01Z (diff) | |
| download | repos-53e6b72ba7a4ed1fd590db59fce81da55e8934cc.tar.gz repos-53e6b72ba7a4ed1fd590db59fce81da55e8934cc.tar.bz2 repos-53e6b72ba7a4ed1fd590db59fce81da55e8934cc.zip | |
2023-10-20T11:00:01Z
Diffstat (limited to 'bobwya.txt')
| -rw-r--r-- | bobwya.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/bobwya.txt b/bobwya.txt index 894d5420dd37..9a96b6ed96a7 100644 --- a/bobwya.txt +++ b/bobwya.txt @@ -15,29 +15,9 @@ pkgcore 0.12.21 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bobwya *** syncing bobwya -From https://github.com/bobwya/miscellaneous_ebuilds - + 36b8e9cc...10c1d941 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 bobwya - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync bobwya -*** syncing bobwya -Cloning into '/var/lib/repo-mirror-ci/sync/bobwya'... +Already up to date. *** synced bobwya - * 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 bobwya |