From d1871e6e420528eae5a5d4e5f9e8ad2a9b8fb7c4 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 24 Nov 2020 18:35:14 +0000 Subject: 2020-11-24T18:30:01Z --- deter.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'deter.html') diff --git a/deter.html b/deter.html index fc3d3bcf5208..0e4fd46ef9f6 100644 --- a/deter.html +++ b/deter.html @@ -36,51 +36,49 @@ 13
$ pmaint sync deter
- 14
WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', 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: Pulling without specifying how to reconcile divergent branches is
+            15
discouraged. You can squelch this message by running one of the following
 

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

-            17
commands sometime before your next pull:
+            17
 

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

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

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

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

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

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

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

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

-            26
invocation.
+            26
 

-            27
+            27
Already up to date.
 

-            28
Already up to date.
+            28
*** syncing deter
 

-            29
*** syncing deter
+            29
*** synced deter
 

-            30
*** synced deter
+            30
 * Sync succeeded
 

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

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

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

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 deter
-

-            35
 * www-client/firefox-52.9.0: failed sourcing ebuild: inherit requires unknown eclass: mozconfig-v6.52.eclass
+            34
 * www-client/firefox-52.9.0: failed sourcing ebuild: inherit requires unknown eclass: mozconfig-v6.52.eclass
 
[FATAL]
-            36
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad