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 --- sorrow.html | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-) (limited to 'sorrow.html') diff --git a/sorrow.html b/sorrow.html index 7b6eaff0e58c..84f9c0bea5f6 100644 --- a/sorrow.html +++ b/sorrow.html @@ -36,57 +36,47 @@ 13
$ pmaint sync sorrow
- 14
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).
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

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

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

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

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

-            21
commands sometime before your next pull:
+            21
 

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

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

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

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

             26
 

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

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

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

-            30
invocation.
+            30
 * Sync succeeded
 

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

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

-            33
*** syncing sorrow
+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sorrow
 

-            34
*** synced sorrow
-

-            35
 * Sync succeeded
-

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

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

-            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 sorrow
-

-            39
 * Cache regenerated successfully
+            34
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad