From 999dec99e30a92fa453f6273302d4ffec271f435 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 13:36:13 +0000 Subject: 2020-10-23T13:30:01Z --- mysql.html | 56 +++++++++++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) (limited to 'mysql.html') diff --git a/mysql.html b/mysql.html index 45eaf35df17b..ceac3486cbf5 100644 --- a/mysql.html +++ b/mysql.html @@ -40,61 +40,47 @@ 15
$ pmaint sync mysql
- 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:gentoo-mate repo at '/var/lib/repo-mirror-ci/sync/gentoo-mate', 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:gnome repo at '/var/lib/repo-mirror-ci/sync/gnome', 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: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
 

-            20
WARNING:pkgcore:libressl repo at '/var/lib/repo-mirror-ci/sync/libressl', 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:maekke repo at '/var/lib/repo-mirror-ci/sync/maekke', 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:mozilla repo at '/var/lib/repo-mirror-ci/sync/mozilla', 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: Pulling without specifying how to reconcile divergent branches is
+            23
 

-            24
discouraged. You can squelch this message by running one of the following
+            24
You can replace "git config" with "git config --global" to set a default
 

-            25
commands sometime before your next pull:
+            25
preference for all repositories. You can also pass --rebase, --no-rebase,
 

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

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

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

-            29
  git config pull.ff only       # fast-forward only
+            29
Already up to date.
 

-            30
+            30
*** syncing mysql
 

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

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

-            33
or --ff-only on the command line to override the configured default per
+            33
$ git log --format=%ci -1
 

-            34
invocation.
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 mysql
 

-            36
Already up to date.
-

-            37
*** syncing mysql
-

-            38
*** synced mysql
-

-            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 mysql
-

-            43
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad