summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-02-01 19:47:22 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-02-01 19:47:22 +0000
commite656518eae59449b46648c294030ad878723baf0 (patch)
treea67f484124c8805b11c51414ff733ef3b77347ed /tranquility.txt
parent2021-02-01T17:00:01Z (diff)
downloadrepos-e656518eae59449b46648c294030ad878723baf0.tar.gz
repos-e656518eae59449b46648c294030ad878723baf0.tar.bz2
repos-e656518eae59449b46648c294030ad878723baf0.zip
2021-02-01T18:30:01Z
Diffstat (limited to 'tranquility.txt')
-rw-r--r--tranquility.txt22
1 files changed, 2 insertions, 20 deletions
diff --git a/tranquility.txt b/tranquility.txt
index b95ca43521c8..de5578e84b15 100644
--- a/tranquility.txt
+++ b/tranquility.txt
@@ -13,28 +13,10 @@
{'type': 'git',
'uri': 'git+ssh://git@git.gentoo.org/repo/dev/tranquility.git'}],
'status': 'official'}
-$ pmaint sync tranquility
-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://anongit.gentoo.org/git/repo/dev/tranquility.git/' not found
-*** syncing tranquility
-!!! failed syncing tranquility
- * Sync failed with 1
- * Will try to re-create
+ * Adding new repository
$ pmaint sync tranquility
Cloning into '/var/lib/repo-mirror-ci/sync/tranquility'...
fatal: repository 'https://anongit.gentoo.org/git/repo/dev/tranquility.git/' not found
*** syncing tranquility
!!! failed syncing tranquility
- * Sync failed again with 1, removing
+ * Sync failed with 1