From 96451d2a5e2f7583cf96b9ea90bb4c9dbda1a645 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Tue, 5 Jan 2021 16:35:02 +0000 Subject: 2021-01-05T16:30:01Z --- xtreemfs.html | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) (limited to 'xtreemfs.html') diff --git a/xtreemfs.html b/xtreemfs.html index 6b591d8cd8ae..23dce2887617 100644 --- a/xtreemfs.html +++ b/xtreemfs.html @@ -42,53 +42,51 @@ 16
$ pmaint sync xtreemfs
- 17
WARNING:pkgcore:lanodanOverlay repo at '/var/lib/repo-mirror-ci/sync/lanodanOverlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            17
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            20
commands sometime before your next pull:
+            20
 

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

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

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

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

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

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

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

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

-            29
invocation.
+            29
 

-            30
+            30
Already up to date.
 

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

-            32
*** syncing xtreemfs
+            32
*** synced xtreemfs
 

-            33
*** synced xtreemfs
+            33
 * Sync succeeded
 

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

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

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

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

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

 
         
-- 
cgit v1.2.3-65-gdbad