summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-09-10 02:35:12 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-09-10 02:35:12 +0000
commit45da4860968bf2b7f0f3e81a9987c94c7e1adc38 (patch)
tree0666d5ea8e747a984caf7a5c30badea3afe8f5fc /holgersson-overlay.txt
parent2020-09-10T02:00:01Z (diff)
downloadrepos-45da4860968bf2b7f0f3e81a9987c94c7e1adc38.tar.gz
repos-45da4860968bf2b7f0f3e81a9987c94c7e1adc38.tar.bz2
repos-45da4860968bf2b7f0f3e81a9987c94c7e1adc38.zip
2020-09-10T02:30:01Z
Diffstat (limited to 'holgersson-overlay.txt')
-rw-r--r--holgersson-overlay.txt22
1 files changed, 20 insertions, 2 deletions
diff --git a/holgersson-overlay.txt b/holgersson-overlay.txt
index 073e4772445a..a2cd14e2bc2f 100644
--- a/holgersson-overlay.txt
+++ b/holgersson-overlay.txt
@@ -8,12 +8,30 @@
'source': [{'type': 'git',
'uri': 'https://git.holgersson.xyz/foss/holgersson-overlay'}],
'status': 'unofficial'}
- * Adding new repository
+$ pmaint sync holgersson-overlay
+warning: Pulling without specifying how to reconcile divergent branches is
+discouraged. You can squelch this message by running one of the following
+commands sometime before your next pull:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+fatal: unable to access 'https://git.holgersson.xyz/foss/holgersson-overlay/': Couldn't resolve host 'git.holgersson.xyz'
+*** syncing holgersson-overlay
+!!! failed syncing holgersson-overlay
+ * Sync failed with 1
+ * Will try to re-create
$ pmaint sync holgersson-overlay
Cloning into '/var/lib/repo-mirror-ci/sync/holgersson-overlay'...
*** syncing holgersson-overlay
*** synced holgersson-overlay
- * Sync succeeded
+ * Sync succeeded after re-adding
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 holgersson-overlay