diff options
Diffstat (limited to 'JRG.txt')
| -rw-r--r-- | JRG.txt | 24 |
1 files changed, 22 insertions, 2 deletions
@@ -16,9 +16,29 @@ pkgcore 0.12.28 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync JRG WARNING:pkgcore:tex-overlay repo at '/var/lib/repo-mirror-ci/sync/tex-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing JRG -Already up to date. +From https://github.com/john-r-graham/jrg-overlay + + ae937d2...6f4c6a2 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 JRG + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync JRG +*** syncing JRG +Cloning into '/var/lib/repo-mirror-ci/sync/JRG'... *** synced JRG - * 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 JRG |