From bc6ec61d8ec9159bded952d841d88ca91ef1affc Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 15 Sep 2020 16:05:13 +0000 Subject: 2020-09-15T16:00:01Z --- interactive-fiction.html | 50 ++++++++++-------------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-) (limited to 'interactive-fiction.html') diff --git a/interactive-fiction.html b/interactive-fiction.html index 5309216d7500..40f05bb4ba88 100644 --- a/interactive-fiction.html +++ b/interactive-fiction.html @@ -28,55 +28,25 @@ 9
 'status': 'unofficial'}
- 10
$ pmaint sync interactive-fiction
+            10
 * Adding new repository
 

-            11
warning: Pulling without specifying how to reconcile divergent branches is
+            11
$ pmaint sync interactive-fiction
 

-            12
discouraged. You can squelch this message by running one of the following
+            12
Cloning into '/var/lib/repo-mirror-ci/sync/interactive-fiction'...
 

-            13
commands sometime before your next pull:
+            13
*** syncing interactive-fiction
 

-            14
+            14
*** synced interactive-fiction
 

-            15
  git config pull.rebase false  # merge (the default strategy)
+            15
 * Sync succeeded
 

-            16
  git config pull.rebase true   # rebase
+            16
$ git log --format=%ci -1
 

-            17
  git config pull.ff only       # fast-forward only
+            17
$ git show -q --pretty=format:%G? HEAD
 

-            18
+            18
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 interactive-fiction
 

-            19
You can replace "git config" with "git config --global" to set a default
-

-            20
preference for all repositories. You can also pass --rebase, --no-rebase,
-

-            21
or --ff-only on the command line to override the configured default per
-

-            22
invocation.
-

-            23
-

-            24
fatal: read error: Connection reset by peer
-

-            25
*** syncing interactive-fiction
-

-            26
!!! failed syncing interactive-fiction
-

-            27
 * Sync failed with 1
-
[FATAL]
-            28
 * Will try to re-create
-

-            29
$ pmaint sync interactive-fiction
-

-            30
Cloning into '/var/lib/repo-mirror-ci/sync/interactive-fiction'...
-

-            31
fatal: read error: Connection reset by peer
-

-            32
*** syncing interactive-fiction
-

-            33
!!! failed syncing interactive-fiction
-

-            34
 * Sync failed again with 1, removing
+            19
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad