From 127f2341f815bd645041bf37523fd8619c8b1425 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 15 Mar 2021 12:52:37 +0000 Subject: 2021-03-15T12:45:01Z --- fordfrog.html | 62 ++++++++++++++++++++--------------------------------------- 1 file changed, 21 insertions(+), 41 deletions(-) (limited to 'fordfrog.html') diff --git a/fordfrog.html b/fordfrog.html index c8470d41fb8a..b4786834d92d 100644 --- a/fordfrog.html +++ b/fordfrog.html @@ -40,67 +40,47 @@ 15
$ pmaint sync fordfrog
- 16
WARNING:pkgcore:0bs1d1an repo at '/var/lib/repo-mirror-ci/sync/0bs1d1an', 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:ag-ops repo at '/var/lib/repo-mirror-ci/sync/ag-ops', 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:argent-main repo at '/var/lib/repo-mirror-ci/sync/argent-main', 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:bitcoin repo at '/var/lib/repo-mirror-ci/sync/bitcoin', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            19
 

-            20
WARNING:pkgcore:brave-overlay repo at '/var/lib/repo-mirror-ci/sync/brave-overlay', 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:pkgcore:concaveoverlay repo at '/var/lib/repo-mirror-ci/sync/concaveoverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            21
  git config pull.rebase true   # rebase
 

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

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

-            24
WARNING:pkgcore:escpr2 repo at '/var/lib/repo-mirror-ci/sync/escpr2', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            26
warning: Pulling without specifying how to reconcile divergent branches is
+            26
or --ff-only on the command line to override the configured default per
 

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

-            28
commands sometime before your next pull:
+            28
 

-            29
+            29
Already up to date.
 

-            30
  git config pull.rebase false  # merge (the default strategy)
+            30
*** syncing fordfrog
 

-            31
  git config pull.rebase true   # rebase
+            31
*** synced fordfrog
 

-            32
  git config pull.ff only       # fast-forward only
+            32
 * Sync succeeded
 

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

-            34
You can replace "git config" with "git config --global" to set a default
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
preference for all repositories. You can also pass --rebase, --no-rebase,
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fordfrog
 

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

-            37
invocation.
-

-            38
-

-            39
Already up to date.
-

-            40
*** syncing fordfrog
-

-            41
*** synced fordfrog
-

-            42
 * Sync succeeded
-

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

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

-            45
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 fordfrog
-

-            46
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad