From 4d34f9dd14518ad1d0e629c5067beebae855b2d4 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 23 Nov 2020 08:05:21 +0000 Subject: 2020-11-23T08:00:01Z --- simonvanderveldt.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'simonvanderveldt.html') diff --git a/simonvanderveldt.html b/simonvanderveldt.html index f7c1458cddcc..e392ae179186 100644 --- a/simonvanderveldt.html +++ b/simonvanderveldt.html @@ -44,47 +44,49 @@ 17
$ pmaint sync simonvanderveldt
- 18
warning: Pulling without specifying how to reconcile divergent branches is
+            18
WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', 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: Pulling without specifying how to reconcile divergent branches is
 

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

-            21
+            21
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            30
+            30
invocation.
 

-            31
Already up to date.
+            31
 

-            32
*** syncing simonvanderveldt
+            32
Already up to date.
 

-            33
*** synced simonvanderveldt
+            33
*** syncing simonvanderveldt
 

-            34
 * Sync succeeded
+            34
*** synced simonvanderveldt
 

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

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

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

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

+            39
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad