From d663d7af0cfa27bca710e3325b20949ed6b829b3 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 18 Oct 2020 05:05:21 +0000 Subject: 2020-10-18T05:00:01Z --- qwin-overlay.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'qwin-overlay.html') diff --git a/qwin-overlay.html b/qwin-overlay.html index 292c338f74e7..67355214e3fa 100644 --- a/qwin-overlay.html +++ b/qwin-overlay.html @@ -28,51 +28,49 @@ 9
$ pmaint sync qwin-overlay
- 10
WARNING:pkgcore:phackerlay repo at '/var/lib/repo-mirror-ci/sync/phackerlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            10
warning: Pulling without specifying how to reconcile divergent branches is
 

-            11
warning: Pulling without specifying how to reconcile divergent branches is
+            11
discouraged. You can squelch this message by running one of the following
 

-            12
discouraged. You can squelch this message by running one of the following
+            12
commands sometime before your next pull:
 

-            13
commands sometime before your next pull:
+            13
 

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

-            15
  git config pull.rebase false  # merge (the default strategy)
+            15
  git config pull.rebase true   # rebase
 

-            16
  git config pull.rebase true   # rebase
+            16
  git config pull.ff only       # fast-forward only
 

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

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

-            19
You can replace "git config" with "git config --global" to set a default
+            19
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            20
preference for all repositories. You can also pass --rebase, --no-rebase,
+            20
or --ff-only on the command line to override the configured default per
 

-            21
or --ff-only on the command line to override the configured default per
+            21
invocation.
 

-            22
invocation.
+            22
 

-            23
+            23
Already up to date.
 

-            24
Already up to date.
+            24
*** syncing qwin-overlay
 

-            25
*** syncing qwin-overlay
+            25
*** synced qwin-overlay
 

-            26
*** synced qwin-overlay
+            26
 * Sync succeeded
 

-            27
 * Sync succeeded
+            27
$ git log --format=%ci -1
 

-            28
$ git log --format=%ci -1
+            28
$ git show -q --pretty=format:%G? HEAD
 

-            29
$ git show -q --pretty=format:%G? HEAD
+            29
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qwin-overlay
 

-            30
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 qwin-overlay
-

-            31
 * x11-terms/sakura-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
+            30
 * x11-terms/sakura-9999: failed sourcing ebuild: inherit requires unknown eclass: bzr.eclass
 
[FATAL]
-            32
 * Cache regen failed with 1
+            31
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad