From e52cb7b016d5b36e8938657f6c9484cfbc8dc418 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 18:05:16 +0000 Subject: 2020-10-23T18:00:01Z --- moexiami.html | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) (limited to 'moexiami.html') diff --git a/moexiami.html b/moexiami.html index 8b7b8ff3fbab..95dfe1f2b26a 100644 --- a/moexiami.html +++ b/moexiami.html @@ -40,57 +40,47 @@ 15
$ pmaint sync moexiami
- 16
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            16
warning: Pulling without specifying how to reconcile divergent branches is
 

-            17
WARNING:pkgcore:java repo at '/var/lib/repo-mirror-ci/sync/java', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
discouraged. You can squelch this message by running one of the following
 

-            18
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            18
commands sometime before your next pull:
 

-            19
WARNING:pkgcore:leio repo at '/var/lib/repo-mirror-ci/sync/leio', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:lisp repo at '/var/lib/repo-mirror-ci/sync/lisp', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            20
  git config pull.rebase false  # merge (the default strategy)
 

-            21
warning: Pulling without specifying how to reconcile divergent branches is
+            21
  git config pull.rebase true   # rebase
 

-            22
discouraged. You can squelch this message by running one of the following
+            22
  git config pull.ff only       # fast-forward only
 

-            23
commands sometime before your next pull:
+            23
 

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

-            25
  git config pull.rebase false  # merge (the default strategy)
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
  git config pull.rebase true   # rebase
+            26
or --ff-only on the command line to override the configured default per
 

-            27
  git config pull.ff only       # fast-forward only
+            27
invocation.
 

             28
 

-            29
You can replace "git config" with "git config --global" to set a default
+            29
Already up to date.
 

-            30
preference for all repositories. You can also pass --rebase, --no-rebase,
+            30
*** syncing moexiami
 

-            31
or --ff-only on the command line to override the configured default per
+            31
*** synced moexiami
 

-            32
invocation.
+            32
 * Sync succeeded
 

-            33
+            33
$ git log --format=%ci -1
 

-            34
Already up to date.
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
*** syncing moexiami
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 moexiami
 

-            36
*** synced moexiami
-

-            37
 * Sync succeeded
-

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

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

-            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 moexiami
-

-            41
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad