From c622cceb77e322e87e49aa4a5ff50005fbb12cbd Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Sun, 25 Apr 2021 06:19:50 +0000 Subject: 2021-04-25T06:15:01Z --- liftm.html | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'liftm.html') diff --git a/liftm.html b/liftm.html index 0332fac73da8..bd898295712e 100644 --- a/liftm.html +++ b/liftm.html @@ -36,51 +36,49 @@ 13
$ pmaint sync liftm
- 14
WARNING:pkgcore:jkolo repo at '/var/lib/repo-mirror-ci/sync/jkolo', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            14
*** syncing liftm
 

-            15
*** syncing liftm
+            15
warning: Pulling without specifying how to reconcile divergent branches is
 

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

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

-            18
commands sometime before your next pull:
+            18
 

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

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

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

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

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

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

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

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

-            27
invocation.
+            27
 

-            28
+            28
Already up to date.
 

-            29
Already up to date.
+            29
*** synced liftm
 

-            30
*** synced liftm
+            30
 * Sync succeeded
 

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

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

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

-            34
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 liftm
-

-            35
 * net-misc/cjdns-21.1: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-single-r1, (python-single-r1.eclass, line  41:  called die)
+            34
 * net-misc/cjdns-21.1: failed sourcing ebuild: Unsupported EAPI=5 (too old) for python-single-r1, (python-single-r1.eclass, line  41:  called die)
 
[FATAL]
-            36
 * Cache regen failed with 1
+            35
 * Cache regen failed with 1
 

 
         
-- 
cgit v1.2.3-65-gdbad