summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'calculate.txt')
-rw-r--r--calculate.txt17
1 files changed, 14 insertions, 3 deletions
diff --git a/calculate.txt b/calculate.txt
index 6cc22f9f3681..f6b936f1689d 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -11,9 +11,20 @@ pkgcore 0.11.8
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync calculate
*** syncing calculate
From git://git.calculate-linux.org/calculate/calculate-overlay
- 6d2af0040..2b7b59cf1 develop -> origin/develop
- 6d2af0040..2b7b59cf1 mhiretskiy -> origin/mhiretskiy
-Already up to date.
+ 6d2af0040..f0ce22b1c master -> origin/master
+ 2b7b59cf1..f0ce22b1c develop -> origin/develop
+ 6d2af0040..f0ce22b1c master64 -> origin/master64
+ 6d2af0040..f0ce22b1c update -> origin/update
+ * [new tag] 2473 -> 2473
+Updating 6d2af0040..f0ce22b1c
+Fast-forward
+ profiles/default/package.keywords/depends | 2 ++
+ .../www-servers/nginx/sites-enabled/.calculate_directory | 1 +
+ profiles/templates/3.6/6_ac_update_sync/remerge/0-ini | 2 +-
+ profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210512 | 4 ++++
+ 4 files changed, 8 insertions(+), 1 deletion(-)
+ create mode 100644 profiles/templates/3.6/2_ac_install_merge/www-servers/nginx/sites-enabled/.calculate_directory
+ create mode 100644 profiles/templates/3.6/6_ac_update_sync/remerge/2021/20210512
*** synced calculate
* Sync succeeded
$ git log --format=%ci -1