diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-02-20 14:18:24 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-02-20 14:18:24 +0000 |
| commit | b095fdada2b0a5d27219f2e4c7b0e34d643e77e5 (patch) | |
| tree | c7c4ab160c9290521a69b1d9a445d371a8663c61 /zscheile.txt | |
| parent | 2024-02-20T14:00:00Z (diff) | |
| download | repos-b095fdada2b0a5d27219f2e4c7b0e34d643e77e5.tar.gz repos-b095fdada2b0a5d27219f2e4c7b0e34d643e77e5.tar.bz2 repos-b095fdada2b0a5d27219f2e4c7b0e34d643e77e5.zip | |
2024-02-20T14:15:00Z
Diffstat (limited to 'zscheile.txt')
| -rw-r--r-- | zscheile.txt | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/zscheile.txt b/zscheile.txt index a2b88d2ee42d..897f907d639f 100644 --- a/zscheile.txt +++ b/zscheile.txt @@ -18,20 +18,28 @@ pkgcore 0.12.24 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync zscheile *** syncing zscheile From https://github.com/fogti/portage-zscheile - fd56fd94..ce039a5c main -> origin/main -Updating fd56fd94..ce039a5c -Fast-forward - dev-lang/ocaml/Manifest | 1 + - dev-lang/ocaml/files/ocaml-rebuild.sh | 51 +++++++++++++++++ - dev-lang/ocaml/files/ocaml.conf | 5 ++ - dev-lang/ocaml/ocaml-5.1.1.ebuild | 100 ++++++++++++++++++++++++++++++++++ - 4 files changed, 157 insertions(+) - create mode 100644 dev-lang/ocaml/Manifest - create mode 100644 dev-lang/ocaml/files/ocaml-rebuild.sh - create mode 100644 dev-lang/ocaml/files/ocaml.conf - create mode 100644 dev-lang/ocaml/ocaml-5.1.1.ebuild + + ce039a5c...82334ba2 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 zscheile + * Sync failed with 1 + * Will try to re-create +$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync zscheile +*** syncing zscheile +Cloning into '/var/lib/repo-mirror-ci/sync/zscheile'... *** synced zscheile - * 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 zscheile |