From e52cb7b016d5b36e8938657f6c9484cfbc8dc418 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Fri, 23 Oct 2020 18:05:16 +0000 Subject: 2020-10-23T18:00:01Z --- science.html | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) (limited to 'science.html') diff --git a/science.html b/science.html index f43b99c044cb..da5b9e93cc4a 100644 --- a/science.html +++ b/science.html @@ -64,41 +64,49 @@ 27
 'status': 'official'}
- 28
 * Adding new repository
+            28
$ pmaint sync science
 

-            29
$ pmaint sync science
+            29
warning: Pulling without specifying how to reconcile divergent branches is
 

-            30
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            30
discouraged. You can squelch this message by running one of the following
 

-            31
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            31
commands sometime before your next pull:
 

-            32
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            32
 

-            33
WARNING:pkgcore:rebutia repo at '/var/lib/repo-mirror-ci/sync/rebutia', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            33
  git config pull.rebase false  # merge (the default strategy)
 

-            34
WARNING:pkgcore:fordfrog repo at '/var/lib/repo-mirror-ci/sync/fordfrog', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            34
  git config pull.rebase true   # rebase
 

-            35
WARNING:pkgcore:kde repo at '/var/lib/repo-mirror-ci/sync/kde', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            35
  git config pull.ff only       # fast-forward only
 

-            36
WARNING:pkgcore:musl repo at '/var/lib/repo-mirror-ci/sync/musl', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            36
 

-            37
WARNING:pkgcore:sattvik repo at '/var/lib/repo-mirror-ci/sync/sattvik', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
+            37
You can replace "git config" with "git config --global" to set a default
 

-            38
Cloning into '/var/lib/repo-mirror-ci/sync/science'...
+            38
preference for all repositories. You can also pass --rebase, --no-rebase,
 

-            39
*** syncing science
+            39
or --ff-only on the command line to override the configured default per
 

-            40
*** synced science
+            40
invocation.
 

-            41
 * Sync succeeded
+            41
 

-            42
$ git log --format=%ci -1
+            42
Already up to date.
 

-            43
$ git show -q --pretty=format:%G? HEAD
+            43
*** syncing science
 

-            44
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 science
+            44
*** synced science
 

-            45
 * Cache regenerated successfully
+            45
 * Sync succeeded
+

+            46
$ git log --format=%ci -1
+

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

+            48
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 science
+

+            49
 * Cache regenerated successfully
 

 
         
-- 
cgit v1.2.3-65-gdbad