diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-03-23 18:04:10 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-03-23 18:04:10 +0000 |
| commit | be55e5829ad09205847e098859bde5dc624870d8 (patch) | |
| tree | 4e0718d1875f539037cc7a12022736b763800e92 /didos.txt | |
| parent | 2023-03-23T17:45:01Z (diff) | |
| download | repos-be55e5829ad09205847e098859bde5dc624870d8.tar.gz repos-be55e5829ad09205847e098859bde5dc624870d8.tar.bz2 repos-be55e5829ad09205847e098859bde5dc624870d8.zip | |
2023-03-23T18:00:01Z
Diffstat (limited to 'didos.txt')
| -rw-r--r-- | didos.txt | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/didos.txt b/didos.txt index 4809d5372f7d..ed32526eff70 100644 --- a/didos.txt +++ b/didos.txt @@ -14,29 +14,9 @@ pkgcore 0.12.20 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync didos *** syncing didos -From https://github.com/prototype99/didos - + b2921bfd...42050e35 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 didos - * Sync failed with 1 - * Will try to re-create -$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync didos -*** syncing didos -Cloning into '/var/lib/repo-mirror-ci/sync/didos'... +Already up to date. *** synced didos - * 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 didos |