From 5c0caacd17f7bde9d1b68896ff76d8d7d9556b61 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Mon, 2 Nov 2020 11:06:55 +0000 Subject: 2020-11-02T11:00:01Z --- sorinp.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'sorinp.html') diff --git a/sorinp.html b/sorinp.html index bc934d5fe4bb..7dcb522e2478 100644 --- a/sorinp.html +++ b/sorinp.html @@ -36,47 +36,49 @@ 13
$ pmaint sync sorinp
- 14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            17
+            17
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            26
+            26
invocation.
 

-            27
Already up to date.
+            27
 

-            28
*** syncing sorinp
+            28
Already up to date.
 

-            29
*** synced sorinp
+            29
*** syncing sorinp
 

-            30
 * Sync succeeded
+            30
*** synced sorinp
 

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

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

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

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

+            35
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad