From 8fc0b36519bab0c859d80f139bc0c8715e865c7e Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 12:36:44 +0000 Subject: 2020-10-23T12:00:01Z --- gamarouns.html | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'gamarouns.html') diff --git a/gamarouns.html b/gamarouns.html index 87ceb5c37bfe..d4bd5293bfe0 100644 --- a/gamarouns.html +++ b/gamarouns.html @@ -32,47 +32,51 @@ 11
$ pmaint sync gamarouns
- 12
warning: Pulling without specifying how to reconcile divergent branches is
+            12
WARNING:pkgcore:blender-gentoo-logo repo at '/var/lib/repo-mirror-ci/sync/blender-gentoo-logo', 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
+            13
WARNING:pkgcore:emacs repo at '/var/lib/repo-mirror-ci/sync/emacs', 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:
+            14
warning: Pulling without specifying how to reconcile divergent branches is
 

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

-            16
  git config pull.rebase false  # merge (the default strategy)
+            16
commands sometime before your next pull:
 

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

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

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

-            20
You can replace "git config" with "git config --global" to set a default
+            20
  git config pull.ff only       # fast-forward only
 

-            21
preference for all repositories. You can also pass --rebase, --no-rebase,
+            21
 

-            22
or --ff-only on the command line to override the configured default per
+            22
You can replace "git config" with "git config --global" to set a default
 

-            23
invocation.
+            23
preference for all repositories. You can also pass --rebase, --no-rebase,
 

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

-            25
Already up to date.
+            25
invocation.
 

-            26
*** syncing gamarouns
+            26
 

-            27
*** synced gamarouns
+            27
Already up to date.
 

-            28
 * Sync succeeded
+            28
*** syncing gamarouns
 

-            29
$ git log --format=%ci -1
+            29
*** synced gamarouns
 

-            30
$ git show -q --pretty=format:%G? HEAD
+            30
 * Sync succeeded
 

-            31
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gamarouns
+            31
$ git log --format=%ci -1
 

-            32
 * Cache regenerated successfully
+            32
$ git show -q --pretty=format:%G? HEAD
+

+            33
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gamarouns
+

+            34
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad