summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gentoo.txt')
-rw-r--r--gentoo.txt21
1 files changed, 6 insertions, 15 deletions
diff --git a/gentoo.txt b/gentoo.txt
index 199eb0085826..f0130603e600 100644
--- a/gentoo.txt
+++ b/gentoo.txt
@@ -26,23 +26,14 @@ or --ff-only on the command line to override the configured default per
invocation.
From https://anongit.gentoo.org/git/repo/gentoo
- ccf2b3ea88c..40f87905372 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: 18% (15920/86244) Updating files: 19% (16387/86244) Updating files: 20% (17249/86244) Updating files: 21% (18112/86244) Updating files: 22% (18974/86244) Updating files: 23% (19837/86244) Updating files: 24% (20699/86244) Updating files: 25% (21561/86244) Updating files: 26% (22424/86244) Updating files: 27% (23286/86244) Updating files: 28% (24149/86244) Updating files: 29% (25011/86244) Updating files: 30% (25874/86244) Updating files: 31% (26736/86244) Updating files: 32% (27599/86244) Updating files: 33% (28461/86244) Updating files: 34% (29323/86244) Updating files: 35% (30186/86244) Updating files: 36% (31048/86244) Updating files: 37% (31911/86244) Updating files: 38% (32773/86244) Updating files: 39% (33636/86244) Updating files: 40% (34498/86244) Updating files: 41% (35361/86244) Updating files: 42% (36223/86244) Updating files: 43% (37085/86244) Updating files: 44% (37948/86244) Updating files: 45% (38810/86244) Updating files: 46% (39673/86244) Updating files: 47% (40535/86244) Updating files: 48% (41398/86244) Updating files: 49% (42260/86244) Updating files: 50% (43122/86244) Updating files: 51% (43985/86244) Updating files: 51% (44506/86244) Updating files: 52% (44847/86244) Updating files: 53% (45710/86244) Updating files: 54% (46572/86244) Updating files: 55% (47435/86244) Updating files: 56% (48297/86244) Updating files: 57% (49160/86244) Updating files: 58% (50022/86244) Updating files: 59% (50884/86244) Updating files: 60% (51747/86244) Updating files: 61% (52609/86244) Updating files: 62% (53472/86244) Updating files: 63% (54334/86244) Updating files: 64% (55197/86244) Updating files: 65% (56059/86244) Updating files: 66% (56922/86244) Updating files: 67% (57784/86244) Updating files: 67% (57842/86244) Updating files: 68% (58646/86244) Updating files: 69% (59509/86244) Updating files: 70% (60371/86244) Updating files: 71% (61234/86244) Updating files: 72% (62096/86244) Updating files: 73% (62959/86244) Updating files: 74% (63821/86244) Updating files: 75% (64683/86244) Updating files: 76% (65546/86244) Updating files: 77% (66408/86244) Updating files: 77% (66964/86244) Updating files: 78% (67271/86244) Updating files: 79% (68133/86244) Updating files: 80% (68996/86244) Updating files: 81% (69858/86244) Updating files: 82% (70721/86244) Updating files: 83% (71583/86244) Updating files: 84% (72445/86244) Updating files: 85% (73308/86244) Updating files: 86% (74170/86244) Updating files: 87% (75033/86244) Updating files: 88% (75895/86244) Updating files: 89% (76758/86244) Updating files: 90% (77620/86244) Updating files: 91% (78483/86244) Updating files: 92% (79345/86244) Updating files: 93% (80207/86244) Updating files: 94% (81070/86244) Updating files: 95% (81932/86244) Updating files: 96% (82795/86244) Updating files: 96% (83210/86244) Updating files: 97% (83657/86244) Updating files: 98% (84520/86244) Updating files: 99% (85382/86244) Updating files: 100% (86244/86244) Updating files: 100% (86244/86244), done.
+ 40f87905372..f52400a5c6d master -> origin/master
+Updating 40f87905372..f52400a5c6d
+Fast-forward
+ dev-util/colm/colm-0.14.6.ebuild | 2 ++
+ 1 file changed, 2 insertions(+)
*** 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