summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt26
1 files changed, 11 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 10e8f1efd67a..12880830b499 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -26,23 +26,19 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- cad24f73a77..f6e17bf2683 master -> origin/master
-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: 20% (17568/87355) Updating files: 21% (18345/87355) Updating files: 22% (19219/87355) Updating files: 23% (20092/87355) Updating files: 24% (20966/87355) Updating files: 25% (21839/87355) Updating files: 26% (22713/87355) Updating files: 27% (23586/87355) Updating files: 28% (24460/87355) Updating files: 29% (25333/87355) Updating files: 30% (26207/87355) Updating files: 31% (27081/87355) Updating files: 32% (27954/87355) Updating files: 33% (28828/87355) Updating files: 34% (29701/87355) Updating files: 35% (30575/87355) Updating files: 36% (31448/87355) Updating files: 37% (32322/87355) Updating files: 38% (33195/87355) Updating files: 39% (34069/87355) Updating files: 40% (34942/87355) Updating files: 41% (35816/87355) Updating files: 41% (36230/87355) Updating files: 42% (36690/87355) Updating files: 43% (37563/87355) Updating files: 44% (38437/87355) Updating files: 45% (39310/87355) Updating files: 46% (40184/87355) Updating files: 47% (41057/87355) Updating files: 48% (41931/87355) Updating files: 49% (42804/87355) Updating files: 50% (43678/87355) Updating files: 51% (44552/87355) Updating files: 52% (45425/87355) Updating files: 53% (46299/87355) Updating files: 54% (47172/87355) Updating files: 55% (48046/87355) Updating files: 56% (48919/87355) Updating files: 57% (49793/87355) Updating files: 58% (50666/87355) Updating files: 59% (51540/87355) Updating files: 60% (52413/87355) Updating files: 60% (53123/87355) Updating files: 61% (53287/87355) Updating files: 62% (54161/87355) Updating files: 63% (55034/87355) Updating files: 64% (55908/87355) Updating files: 65% (56781/87355) Updating files: 66% (57655/87355) Updating files: 67% (58528/87355) Updating files: 68% (59402/87355) Updating files: 69% (60275/87355) Updating files: 70% (61149/87355) Updating files: 71% (62023/87355) Updating files: 72% (62896/87355) Updating files: 73% (63770/87355) Updating files: 74% (64643/87355) Updating files: 75% (65517/87355) Updating files: 76% (66390/87355) Updating files: 77% (67264/87355) Updating files: 78% (68137/87355) Updating files: 79% (69011/87355) Updating files: 80% (69884/87355) Updating files: 81% (70758/87355) Updating files: 81% (71160/87355) Updating files: 82% (71632/87355) Updating files: 83% (72505/87355) Updating files: 84% (73379/87355) Updating files: 85% (74252/87355) Updating files: 86% (75126/87355) Updating files: 87% (75999/87355) Updating files: 88% (76873/87355) Updating files: 89% (77746/87355) Updating files: 90% (78620/87355) Updating files: 91% (79494/87355) Updating files: 92% (80367/87355) Updating files: 93% (81241/87355) Updating files: 94% (82114/87355) Updating files: 95% (82988/87355) Updating files: 96% (83861/87355) Updating files: 97% (84735/87355) Updating files: 97% (85439/87355) Updating files: 98% (85608/87355) Updating files: 99% (86482/87355) Updating files: 100% (87355/87355) Updating files: 100% (87355/87355), done.
+ f6e17bf2683..5b2f98057a8 master -> origin/master
+Updating f6e17bf2683..5b2f98057a8
+Fast-forward
+ dev-python/errorhandler/errorhandler-2.0.1.ebuild | 28 ++++------------------
+ dev-python/exam/exam-0.10.6.ebuild | 2 +-
+ dev-python/fcl/fcl-0.0.12.ebuild | 2 +-
+ .../flake8-import-order-0.18.ebuild | 4 ++--
+ dev-python/genson/genson-1.1.0.ebuild | 19 ++++-----------
+ profiles/package.mask | 12 ++++++++++
+ 6 files changed, 24 insertions(+), 43 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