summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'calculate.txt')
-rw-r--r--calculate.txt24
1 files changed, 2 insertions, 22 deletions
diff --git a/calculate.txt b/calculate.txt
index 2f53d59b337..887eb5a1dc1 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -6,27 +6,7 @@
'source': [{'type': 'git',
'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}],
'status': 'unofficial'}
-$ pmaint sync calculate
-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 connect to git.calculate-linux.org:
-git.calculate-linux.org[0: 80.246.250.190]: errno=Connection timed out
-
-*** syncing calculate
-!!! failed syncing calculate
- * Sync failed with 1
- * Will try to re-create
+ * Adding new repository
$ pmaint sync calculate
Cloning into '/var/lib/repo-mirror-ci/sync/calculate'...
fatal: unable to connect to git.calculate-linux.org:
@@ -34,4 +14,4 @@ git.calculate-linux.org[0: 80.246.250.190]: errno=Connection timed out
*** syncing calculate
!!! failed syncing calculate
- * Sync failed again with 1, removing
+ * Sync failed with 1