summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-09-15 23:05:13 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-09-15 23:05:13 +0000
commit2223da0a3a3680eed543dca7641e232ffd32e018 (patch)
tree673d2611d5975549d99856bfa137fb6129d2c2d0 /SwordArMor.txt
parent2020-09-15T22:30:01Z (diff)
downloadrepos-2223da0a3a3680eed543dca7641e232ffd32e018.tar.gz
repos-2223da0a3a3680eed543dca7641e232ffd32e018.tar.bz2
repos-2223da0a3a3680eed543dca7641e232ffd32e018.zip
2020-09-15T23:00:01Z
Diffstat (limited to 'SwordArMor.txt')
-rw-r--r--SwordArMor.txt25
1 files changed, 2 insertions, 23 deletions
diff --git a/SwordArMor.txt b/SwordArMor.txt
index 9f4a2934c9e1..484847b06c53 100644
--- a/SwordArMor.txt
+++ b/SwordArMor.txt
@@ -10,28 +10,7 @@
{'type': 'git',
'uri': 'git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git'}],
'status': 'unofficial'}
-$ pmaint sync SwordArMor
-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: Could not read from remote repository.
-
-Please make sure you have the correct access rights
-and the repository exists.
-*** syncing SwordArMor
-!!! failed syncing SwordArMor
- * Sync failed with 1
- * Will try to re-create
+ * Adding new repository
$ pmaint sync SwordArMor
Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'...
fatal: Could not read from remote repository.
@@ -40,4 +19,4 @@ Please make sure you have the correct access rights
and the repository exists.
*** syncing SwordArMor
!!! failed syncing SwordArMor
- * Sync failed again with 1, removing
+ * Sync failed with 1