From 48572c4f5133a77a965d6c1a4d4af41ecae1bb0a Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 29 Oct 2020 07:53:33 +0000 Subject: 2020-10-29T07:30:01Z --- xtreemfs.html | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) (limited to 'xtreemfs.html') diff --git a/xtreemfs.html b/xtreemfs.html index 23dce2887617..1d7198586a0d 100644 --- a/xtreemfs.html +++ b/xtreemfs.html @@ -42,51 +42,55 @@ 16
$ pmaint sync xtreemfs
- 17
warning: Pulling without specifying how to reconcile divergent branches is
+            17
WARNING:pkgcore:k_f repo at '/var/lib/repo-mirror-ci/sync/k_f', 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:pkgcore:k_f repo at '/var/lib/repo-mirror-ci/sync/k_f', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

-            19
commands sometime before your next pull:
+            19
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

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

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

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

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

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

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

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

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

-            30
Already up to date.
+            30
invocation.
 

-            31
*** syncing xtreemfs
+            31
 

-            32
*** synced xtreemfs
+            32
Already up to date.
 

-            33
 * Sync succeeded
+            33
*** syncing xtreemfs
 

-            34
$ git log --format=%ci -1
+            34
*** synced xtreemfs
 

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

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

-            37
 * net-fs/xtreemfs-1.5.1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            37
$ git show -q --pretty=format:%G? HEAD
+

+            38
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 xtreemfs
+

+            39
 * net-fs/xtreemfs-1.5.1: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            38
 * net-fs/xtreemfs-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
+            40
 * net-fs/xtreemfs-9999: failed sourcing ebuild: inherit requires unknown eclass: git-2.eclass
 
[FATAL]
-            39
 * Cache regen failed with 1
+            41
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad