From 55d4713cabd045f435a37948ea9caf7d87c1211f Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 5 Oct 2020 18:05:16 +0000 Subject: 2020-10-05T18:00:01Z --- pixlra.html | 56 ++++++++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) (limited to 'pixlra.html') diff --git a/pixlra.html b/pixlra.html index ea79b6a18a7f..970efdb87e9e 100644 --- a/pixlra.html +++ b/pixlra.html @@ -46,61 +46,49 @@ 18
$ pmaint sync pixlra
- 19
warning: Pulling without specifying how to reconcile divergent branches is
+            19
WARNING:pkgcore:palmer repo at '/var/lib/repo-mirror-ci/sync/palmer', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            20
discouraged. You can squelch this message by running one of the following
+            20
warning: Pulling without specifying how to reconcile divergent branches is
 

-            21
commands sometime before your next pull:
+            21
discouraged. You can squelch this message by running one of the following
 

-            22
+            22
commands sometime before your next pull:
 

-            23
  git config pull.rebase false  # merge (the default strategy)
+            23
 

-            24
  git config pull.rebase true   # rebase
+            24
  git config pull.rebase false  # merge (the default strategy)
 

-            25
  git config pull.ff only       # fast-forward only
+            25
  git config pull.rebase true   # rebase
 

-            26
+            26
  git config pull.ff only       # fast-forward only
 

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

-            28
preference for all repositories. You can also pass --rebase, --no-rebase,
+            28
You can replace "git config" with "git config --global" to set a default
 

-            29
or --ff-only on the command line to override the configured default per
+            29
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            30
invocation.
+            30
or --ff-only on the command line to override the configured default per
 

-            31
+            31
invocation.
 

-            32
fatal: unable to access 'https://anongit.gentoo.org/git/user/carreira.git/': The requested URL returned error: 504
+            32
 

-            33
*** syncing pixlra
+            33
Already up to date.
 

-            34
!!! failed syncing pixlra
+            34
*** syncing pixlra
 

-            35
 * Sync failed with 1
-
[FATAL]
-            36
 * Will try to re-create
+            35
*** synced pixlra
 

-            37
$ pmaint sync pixlra
+            36
 * Sync succeeded
 

-            38
WARNING:pkgcore:mysql repo at '/var/lib/repo-mirror-ci/sync/mysql', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
$ git log --format=%ci -1
 

-            39
Cloning into '/var/lib/repo-mirror-ci/sync/pixlra'...
+            38
$ git show -q --pretty=format:%G? HEAD
 

-            40
*** syncing pixlra
+            39
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pixlra
 

-            41
*** synced pixlra
-

-            42
 * Sync succeeded after re-adding
-

-            43
$ git log --format=%ci -1
-

-            44
$ git show -q --pretty=format:%G? HEAD
-

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 pixlra
-

-            46
 * Cache regenerated successfully
+            40
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad