From 14d256367ed16286e3639c1d28403c85a9fc5d5a Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 10 Jan 2021 10:05:06 +0000 Subject: 2021-01-10T10:00:01Z --- superposition.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'superposition.html') diff --git a/superposition.html b/superposition.html index b6424152b44b..3ff302aceff3 100644 --- a/superposition.html +++ b/superposition.html @@ -42,47 +42,49 @@ 16
$ pmaint sync superposition
- 17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
WARNING:pkgcore:slonko repo at '/var/lib/repo-mirror-ci/sync/slonko', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            20
+            20
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            29
+            29
invocation.
 

-            30
Already up to date.
+            30
 

-            31
*** syncing superposition
+            31
Already up to date.
 

-            32
*** synced superposition
+            32
*** syncing superposition
 

-            33
 * Sync succeeded
+            33
*** synced superposition
 

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

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

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

-            37
 * Cache regenerated successfully
+            37
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 superposition
+

+            38
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad