From b9626d7d459ace4edea50b993afc79b85d940737 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 30 Sep 2020 07:06:51 +0000 Subject: 2020-09-30T07:00:01Z --- flightsim.html | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'flightsim.html') diff --git a/flightsim.html b/flightsim.html index 7e80257d039f..76c811c67e96 100644 --- a/flightsim.html +++ b/flightsim.html @@ -44,47 +44,51 @@ 17
$ pmaint sync flightsim
- 18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
WARNING:pkgcore:calculate repo at '/var/lib/repo-mirror-ci/sync/calculate', 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:distros repo at '/var/lib/repo-mirror-ci/sync/distros', 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: Pulling without specifying how to reconcile divergent branches is
 

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

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

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

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

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

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

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

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

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

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

-            31
Already up to date.
+            31
invocation.
 

-            32
*** syncing flightsim
+            32
 

-            33
*** synced flightsim
+            33
Already up to date.
 

-            34
 * Sync succeeded
+            34
*** syncing flightsim
 

-            35
$ git log --format=%ci -1
+            35
*** synced flightsim
 

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

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

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

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

+            40
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad