From 3f0a3209324f94eea02d615bdd9758825320c024 Mon Sep 17 00:00:00 2001 From: Repository mirror & CI Date: Wed, 31 Mar 2021 09:16:51 +0000 Subject: 2021-03-31T09:15:01Z --- milos-rs.html | 44 +++++++------------------------------------- 1 file changed, 7 insertions(+), 37 deletions(-) (limited to 'milos-rs.html') diff --git a/milos-rs.html b/milos-rs.html index 406763eb82e5..91af2693253f 100644 --- a/milos-rs.html +++ b/milos-rs.html @@ -34,47 +34,17 @@ 12
$ pmaint sync milos-rs
- 13
*** syncing milos-rs
+            13
pmaint sync: error: argument repo: couldn't find repo 'milos-rs' (available: gentoo:/usr/portage)
 

-            14
warning: Pulling without specifying how to reconcile divergent branches is
+            14
 * Sync failed with 2
+
[FATAL]
+            15
 * Will try to re-create
 

-            15
discouraged. You can squelch this message by running one of the following
+            16
$ pmaint sync milos-rs
 

-            16
commands sometime before your next pull:
+            17
pmaint sync: error: argument repo: couldn't find repo 'milos-rs' (available: gentoo:/usr/portage)
 

-            17
-

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

-            19
  git config pull.rebase true   # rebase
-

-            20
  git config pull.ff only       # fast-forward only
-

-            21
-

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

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

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

-            25
invocation.
-

-            26
-

-            27
Already up to date.
-

-            28
*** synced milos-rs
-

-            29
 * Sync succeeded
-

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

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

-            32
$ pmaint regen --use-local-desc --pkg-desc-index -t 32 milos-rs
-

-            33
 * Cache regenerated successfully
+            18
 * Sync failed again with 2, removing
 

 
         
-- 
cgit v1.2.3-65-gdbad