summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt24
1 files changed, 10 insertions, 14 deletions
diff --git a/gentoo.txt b/gentoo.txt
index c81df5e09879..9da876755898 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -25,22 +25,18 @@ preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.
-You are not currently on a branch.
-Please specify which branch you want to merge with.
-See git-pull(1) for details.
-
- git pull <remote> <branch>
-
-*** syncing gentoo
-!!! failed syncing gentoo
- * Sync failed with 1
- * Will try to re-create
-$ pmaint sync gentoo
-Cloning into '/var/lib/repo-mirror-ci/sync/gentoo'...
-Updating files: 16% (15024/89106) Updating files: 17% (15149/89106) Updating files: 18% (16040/89106) Updating files: 19% (16931/89106) Updating files: 20% (17822/89106) Updating files: 21% (18713/89106) Updating files: 22% (19604/89106) Updating files: 23% (20495/89106) Updating files: 24% (21386/89106) Updating files: 25% (22277/89106) Updating files: 26% (23168/89106) Updating files: 27% (24059/89106) Updating files: 28% (24950/89106) Updating files: 29% (25841/89106) Updating files: 30% (26732/89106) Updating files: 31% (27623/89106) Updating files: 32% (28514/89106) Updating files: 33% (29405/89106) Updating files: 34% (30297/89106) Updating files: 34% (30935/89106) Updating files: 35% (31188/89106) Updating files: 36% (32079/89106) Updating files: 37% (32970/89106) Updating files: 38% (33861/89106) Updating files: 39% (34752/89106) Updating files: 40% (35643/89106) Updating files: 41% (36534/89106) Updating files: 42% (37425/89106) Updating files: 43% (38316/89106) Updating files: 44% (39207/89106) Updating files: 45% (40098/89106) Updating files: 46% (40989/89106) Updating files: 47% (41880/89106) Updating files: 48% (42771/89106) Updating files: 49% (43662/89106) Updating files: 50% (44553/89106) Updating files: 51% (45445/89106) Updating files: 51% (45911/89106) Updating files: 52% (46336/89106) Updating files: 53% (47227/89106) Updating files: 54% (48118/89106) Updating files: 55% (49009/89106) Updating files: 56% (49900/89106) Updating files: 57% (50791/89106) Updating files: 58% (51682/89106) Updating files: 59% (52573/89106) Updating files: 60% (53464/89106) Updating files: 61% (54355/89106) Updating files: 62% (55246/89106) Updating files: 63% (56137/89106) Updating files: 64% (57028/89106) Updating files: 65% (57919/89106) Updating files: 66% (58810/89106) Updating files: 67% (59702/89106) Updating files: 67% (60101/89106) Updating files: 68% (60593/89106) Updating files: 69% (61484/89106) Updating files: 70% (62375/89106) Updating files: 71% (63266/89106) Updating files: 72% (64157/89106) Updating files: 73% (65048/89106) Updating files: 74% (65939/89106) Updating files: 75% (66830/89106) Updating files: 76% (67721/89106) Updating files: 77% (68612/89106) Updating files: 77% (68966/89106) Updating files: 78% (69503/89106) Updating files: 79% (70394/89106) Updating files: 80% (71285/89106) Updating files: 81% (72176/89106) Updating files: 82% (73067/89106) Updating files: 83% (73958/89106) Updating files: 84% (74850/89106) Updating files: 85% (75741/89106) Updating files: 86% (76632/89106) Updating files: 87% (77523/89106) Updating files: 88% (78414/89106) Updating files: 89% (79305/89106) Updating files: 90% (80196/89106) Updating files: 91% (81087/89106) Updating files: 92% (81978/89106) Updating files: 92% (82589/89106) Updating files: 93% (82869/89106) Updating files: 94% (83760/89106) Updating files: 95% (84651/89106) Updating files: 96% (85542/89106) Updating files: 97% (86433/89106) Updating files: 98% (87324/89106) Updating files: 99% (88215/89106) Updating files: 100% (89106/89106) Updating files: 100% (89106/89106), done.
+From https://anongit.gentoo.org/git/repo/gentoo
+ 504289cf7fd..29e0f764eb1 master -> origin/master
+Updating 504289cf7fd..29e0f764eb1
+Fast-forward
+ app-emulation/docker-registry/docker-registry-2.7.1.ebuild | 4 ++--
+ profiles/arch/riscv/rv32imac/ilp32d/make.defaults | 2 +-
+ profiles/arch/riscv/rv32imac/make.defaults | 6 +++---
+ sys-libs/db/db-5.3.28-r4.ebuild | 2 +-
+ 4 files changed, 7 insertions(+), 7 deletions(-)
*** syncing gentoo
*** synced gentoo
- * Sync succeeded after re-adding
+ * Sync succeeded
$ git log --format=%ci -1
$ git show -q --pretty=format:%G? HEAD
$ pmaint regen --use-local-desc --pkg-desc-index -t 1 gentoo