diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2022-06-05 12:03:10 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-06-05 12:03:10 +0000 |
| commit | e553d45a45980264bd7690e5f2536eed01e4c5fb (patch) | |
| tree | c81d2cde59c86d7686fe9d5ac5f9e45546af43a6 /vGist.txt | |
| parent | 2022-06-05T11:45:01Z (diff) | |
| download | repos-e553d45a45980264bd7690e5f2536eed01e4c5fb.tar.gz repos-e553d45a45980264bd7690e5f2536eed01e4c5fb.tar.bz2 repos-e553d45a45980264bd7690e5f2536eed01e4c5fb.zip | |
2022-06-05T12:00:01Z
Diffstat (limited to 'vGist.txt')
| -rw-r--r-- | vGist.txt | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/vGist.txt b/vGist.txt index 6c291f6d38ff..215776e42a92 100644 --- a/vGist.txt +++ b/vGist.txt @@ -14,13 +14,28 @@ $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist WARNING:pkgcore:sergiotarxz repo at '/var/lib/repo-mirror-ci/sync/sergiotarxz', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). *** syncing vGist From https://github.com/vgist/vgist-overlay - 2e4f72c..6c7f069 master -> origin/master -Updating 2e4f72c..6c7f069 -Fast-forward - net-im/weixin-uos/weixin-uos-2.1.4.ebuild | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) + + 6c7f069...7607041 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 vGist + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync vGist +*** syncing vGist +Cloning into '/var/lib/repo-mirror-ci/sync/vGist'... *** synced vGist - * 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 vGist |