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 --- petkovich.html | 54 +++++++++++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 33 deletions(-) (limited to 'petkovich.html') diff --git a/petkovich.html b/petkovich.html index 95419d8e616a..6427af0cac0d 100644 --- a/petkovich.html +++ b/petkovich.html @@ -42,59 +42,47 @@ 16
$ pmaint sync petkovich
- 17
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).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

-            18
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).
+            18
discouraged. You can squelch this message by running one of the following
 

-            19
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).
+            19
commands sometime before your next pull:
 

-            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
 

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

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

-            23
warning: Pulling without specifying how to reconcile divergent branches is
+            23
  git config pull.ff only       # fast-forward only
 

-            24
discouraged. You can squelch this message by running one of the following
+            24
 

-            25
commands sometime before your next pull:
+            25
You can replace "git config" with "git config --global" to set a default
 

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

-            27
  git config pull.rebase false  # merge (the default strategy)
+            27
or --ff-only on the command line to override the configured default per
 

-            28
  git config pull.rebase true   # rebase
+            28
invocation.
 

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

-            30
+            30
Already up to date.
 

-            31
You can replace "git config" with "git config --global" to set a default
+            31
*** syncing petkovich
 

-            32
preference for all repositories. You can also pass --rebase, --no-rebase,
+            32
*** synced petkovich
 

-            33
or --ff-only on the command line to override the configured default per
+            33
 * Sync succeeded
 

-            34
invocation.
+            34
$ git log --format=%ci -1
 

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

-            36
Already up to date.
+            36
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 petkovich
 

-            37
*** syncing petkovich
-

-            38
*** synced petkovich
-

-            39
 * Sync succeeded
-

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

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

-            42
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 petkovich
-

-            43
 * Cache regenerated successfully
+            37
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad