summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-04-28 18:34:53 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-04-28 18:34:53 +0000
commit2b466f0f4e38600e977dbb4a4e056216c0222ac5 (patch)
tree93ae79c814e2b9b0c3f44c40b3c92445d6014a57 /zGentoo.txt
parent2021-04-28T18:15:01Z (diff)
downloadrepos-2b466f0f4e38600e977dbb4a4e056216c0222ac5.tar.gz
repos-2b466f0f4e38600e977dbb4a4e056216c0222ac5.tar.bz2
repos-2b466f0f4e38600e977dbb4a4e056216c0222ac5.zip
2021-04-28T18:30:01Z
Diffstat (limited to 'zGentoo.txt')
-rw-r--r--zGentoo.txt22
1 files changed, 2 insertions, 20 deletions
diff --git a/zGentoo.txt b/zGentoo.txt
index 562df13b446c..0d87a5fa5bc5 100644
--- a/zGentoo.txt
+++ b/zGentoo.txt
@@ -10,28 +10,10 @@
'uri': 'https://lab.retarded.farm/zappel/zGentoo.git'},
{'type': 'git', 'uri': 'git@lab.retarded.farm:zappel/zGentoo.git'}],
'status': 'unofficial'}
-$ pmaint sync zGentoo
-*** syncing zGentoo
-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: repository 'https://lab.retarded.farm/zappel/zGentoo.git/' not found
-!!! failed syncing zGentoo
- * Sync failed with 1
- * Will try to re-create
+ * Adding new repository
$ pmaint sync zGentoo
*** syncing zGentoo
Cloning into '/var/lib/repo-mirror-ci/sync/zGentoo'...
fatal: repository 'https://lab.retarded.farm/zappel/zGentoo.git/' not found
!!! failed syncing zGentoo
- * Sync failed again with 1, removing
+ * Sync failed with 1