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 --- flightsim.html | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'flightsim.html') diff --git a/flightsim.html b/flightsim.html index 7e80257d039f..37c79980bb32 100644 --- a/flightsim.html +++ b/flightsim.html @@ -44,47 +44,55 @@ 17
$ pmaint sync flightsim
- 18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
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).
 

-            19
discouraged. You can squelch this message by running one of the following
+            19
WARNING:pkgcore:darkelf repo at '/var/lib/repo-mirror-ci/sync/darkelf', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

-            21
+            21
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).
 

-            22
  git config pull.rebase false  # merge (the default strategy)
+            22
warning: Pulling without specifying how to reconcile divergent branches is
 

-            23
  git config pull.rebase true   # rebase
+            23
discouraged. You can squelch this message by running one of the following
 

-            24
  git config pull.ff only       # fast-forward only
+            24
commands sometime before your next pull:
 

             25
 

-            26
You can replace "git config" with "git config --global" to set a default
+            26
  git config pull.rebase false  # merge (the default strategy)
 

-            27
preference for all repositories. You can also pass --rebase, --no-rebase,
+            27
  git config pull.rebase true   # rebase
 

-            28
or --ff-only on the command line to override the configured default per
+            28
  git config pull.ff only       # fast-forward only
 

-            29
invocation.
+            29
 

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

-            31
Already up to date.
+            31
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            32
*** syncing flightsim
+            32
or --ff-only on the command line to override the configured default per
 

-            33
*** synced flightsim
+            33
invocation.
 

-            34
 * Sync succeeded
+            34
 

-            35
$ git log --format=%ci -1
+            35
Already up to date.
 

-            36
$ git show -q --pretty=format:%G? HEAD
+            36
*** syncing flightsim
 

-            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flightsim
+            37
*** synced flightsim
 

-            38
 * Cache regenerated successfully
+            38
 * Sync succeeded
+

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

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

+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 flightsim
+

+            42
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad