From 8b5b94af26747120787e6a3de38359c240744a7d Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Thu, 26 Nov 2020 20:05:18 +0000 Subject: 2020-11-26T20:00:01Z --- vklimovs.html | 62 +++++++++++++++++++++-------------------------------------- 1 file changed, 22 insertions(+), 40 deletions(-) (limited to 'vklimovs.html') diff --git a/vklimovs.html b/vklimovs.html index e31c2763e373..e134a471ac69 100644 --- a/vklimovs.html +++ b/vklimovs.html @@ -38,67 +38,49 @@ 14
$ pmaint sync vklimovs
- 15
warning: Pulling without specifying how to reconcile divergent branches is
+            15
WARNING:pkgcore:ext-devlibs repo at '/var/lib/repo-mirror-ci/sync/ext-devlibs', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
 

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

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

-            18
+            18
commands sometime before your next pull:
 

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

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

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

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

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

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

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

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

-            27
+            27
invocation.
 

-            28
From https://github.com/vklimovs/portage-overlay
+            28
 

-            29
   fc7fb3c..b78d787  master     -> origin/master
+            29
Already up to date.
 

-            30
Updating fc7fb3c..b78d787
+            30
*** syncing vklimovs
 

-            31
Fast-forward
+            31
*** synced vklimovs
 

-            32
 dev-go/broccoli/Manifest              | 26 +++++++++++++++++++
+            32
 * Sync succeeded
 

-            33
 dev-go/broccoli/broccoli-1.0.3.ebuild | 47 +++++++++++++++++++++++++++++++++++
+            33
$ git log --format=%ci -1
 

-            34
 dev-go/broccoli/metadata.xml          | 22 ++++++++++++++++
+            34
$ git show -q --pretty=format:%G? HEAD
 

-            35
 3 files changed, 95 insertions(+)
+            35
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vklimovs
 

-            36
 create mode 100644 dev-go/broccoli/Manifest
-

-            37
 create mode 100644 dev-go/broccoli/broccoli-1.0.3.ebuild
-

-            38
 create mode 100644 dev-go/broccoli/metadata.xml
-

-            39
*** syncing vklimovs
-

-            40
*** synced vklimovs
-

-            41
 * Sync succeeded
-

-            42
$ git log --format=%ci -1
-

-            43
$ git show -q --pretty=format:%G? HEAD
-

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 vklimovs
-

-            45
 * Cache regenerated successfully
+            36
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad