From 2c0e1d1ec9a227834c21adeac5d60b3b66e3f230 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 9 Mar 2021 07:50:42 +0000 Subject: 2021-03-09T07:45:01Z --- tmacedo.html | 62 ++++++++++++++++++++---------------------------------------- 1 file changed, 21 insertions(+), 41 deletions(-) (limited to 'tmacedo.html') diff --git a/tmacedo.html b/tmacedo.html index d6cdeb3c012e..488069c50fbc 100644 --- a/tmacedo.html +++ b/tmacedo.html @@ -32,67 +32,47 @@ 11
$ pmaint sync tmacedo
- 12
WARNING:pkgcore:linux-be repo at '/var/lib/repo-mirror-ci/sync/linux-be', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            12
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

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

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

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

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

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

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

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

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

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

-            24
commands sometime before your next pull:
+            24
 

-            25
+            25
Already up to date.
 

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

-            27
  git config pull.rebase true   # rebase
+            27
*** synced tmacedo
 

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

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

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

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

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

-            33
invocation.
-

-            34
-

-            35
Already up to date.
-

-            36
*** syncing tmacedo
-

-            37
*** synced tmacedo
-

-            38
 * Sync succeeded
-

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

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

-            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 tmacedo
-

-            42
 * Cache regenerated successfully
+            32
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad