From 2239af328c8efd7349c3db655fd2fc6d80833bf8 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 2 May 2021 08:50:54 +0000 Subject: 2021-05-02T08:45:01Z --- mv.html | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'mv.html') diff --git a/mv.html b/mv.html index 8ab71f5721c9..5f92496a0802 100644 --- a/mv.html +++ b/mv.html @@ -50,47 +50,49 @@ 20
$ pmaint sync mv
- 21
*** syncing mv
+            21
WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            22
warning: Pulling without specifying how to reconcile divergent branches is
+            22
*** syncing mv
 

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

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

-            25
+            25
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            34
+            34
invocation.
 

-            35
Already up to date.
+            35
 

-            36
*** synced mv
+            36
Already up to date.
 

-            37
 * Sync succeeded
+            37
*** synced mv
 

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

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

-            40
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mv
+            40
$ git show -q --pretty=format:%G? HEAD
 

-            41
 * Cache regenerated successfully
+            41
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 mv
+

+            42
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad