diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-01-26 15:46:51 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-01-26 15:46:51 +0000 |
| commit | 4a27c6b05e57208de2877910bc8ffa47ea8efba2 (patch) | |
| tree | 95fbdde64acabb47a9b9eb98972bae3c35f878ae /tatsh-overlay.txt | |
| parent | 2023-01-26T15:30:01Z (diff) | |
| download | repos-4a27c6b05e57208de2877910bc8ffa47ea8efba2.tar.gz repos-4a27c6b05e57208de2877910bc8ffa47ea8efba2.tar.bz2 repos-4a27c6b05e57208de2877910bc8ffa47ea8efba2.zip | |
2023-01-26T15:45:01Z
Diffstat (limited to 'tatsh-overlay.txt')
| -rw-r--r-- | tatsh-overlay.txt | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/tatsh-overlay.txt b/tatsh-overlay.txt index dc1c29ec673f..eadde7a3158a 100644 --- a/tatsh-overlay.txt +++ b/tatsh-overlay.txt @@ -16,18 +16,28 @@ pkgcore 0.12.17 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay *** syncing tatsh-overlay From https://github.com/Tatsh/tatsh-overlay - 8852aa31..dca935d5 master -> origin/master -Updating 8852aa31..dca935d5 -Fast-forward - sys-apps/tinkup/Manifest | 3 +++ - sys-apps/tinkup/metadata.xml | 11 +++++++++++ - sys-apps/tinkup/tinkup-1.0_p20220425.ebuild | 28 ++++++++++++++++++++++++++++ - 3 files changed, 42 insertions(+) - create mode 100644 sys-apps/tinkup/Manifest - create mode 100644 sys-apps/tinkup/metadata.xml - create mode 100644 sys-apps/tinkup/tinkup-1.0_p20220425.ebuild + + dca935d5...709e03d5 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 tatsh-overlay + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync tatsh-overlay +*** syncing tatsh-overlay +Cloning into '/var/lib/repo-mirror-ci/sync/tatsh-overlay'... *** synced tatsh-overlay - * 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 tatsh-overlay |