diff options
Diffstat (limited to 'mv.txt')
| -rw-r--r-- | mv.txt | 32 |
1 files changed, 21 insertions, 11 deletions
@@ -20,18 +20,28 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mv *** syncing mv From https://anongit.gentoo.org/git/user/mv - 44d06240..d82bf3a9 main -> origin/main -Updating 44d06240..d82bf3a9 -Fast-forward - app-portage/eix/{eix-0.36.7-r2.ebuild => eix-0.36.7-r3.ebuild} | 2 +- - app-portage/eix/eix-99999999.ebuild | 2 +- - eclass/meson.eclass | 6 +++--- - metadata/pkg_desc_index | 2 +- - sys-fs/squash_dir/squash_dir-13.14-r1.ebuild | 2 +- - 5 files changed, 7 insertions(+), 7 deletions(-) - rename app-portage/eix/{eix-0.36.7-r2.ebuild => eix-0.36.7-r3.ebuild} (99%) + + d82bf3a9...e3a9df68 main -> origin/main (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 mv + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mv +*** syncing mv +Cloning into '/var/lib/repo-mirror-ci/sync/mv'... *** synced mv - * 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 mv |