From 753a1214c29ca664403e0aa05ed0406658302240 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 4 Oct 2020 01:06:54 +0000 Subject: 2020-10-04T01:00:01Z --- sorinp.html | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'sorinp.html') diff --git a/sorinp.html b/sorinp.html index 1f3ba1437cfe..0eae9ee9728c 100644 --- a/sorinp.html +++ b/sorinp.html @@ -36,49 +36,51 @@ 13
$ pmaint sync sorinp
- 14
WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
WARNING:pkgcore:distros repo at '/var/lib/repo-mirror-ci/sync/distros', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            18
+            18
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            27
+            27
invocation.
 

-            28
Already up to date.
+            28
 

-            29
*** syncing sorinp
+            29
Already up to date.
 

-            30
*** synced sorinp
+            30
*** syncing sorinp
 

-            31
 * Sync succeeded
+            31
*** synced sorinp
 

-            32
$ git log --format=%ci -1
+            32
 * Sync succeeded
 

-            33
$ git show -q --pretty=format:%G? HEAD
+            33
$ git log --format=%ci -1
 

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sorinp
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
 * Cache regenerated successfully
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sorinp
+

+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad