summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'calculate.txt')
-rw-r--r--calculate.txt13
1 files changed, 8 insertions, 5 deletions
diff --git a/calculate.txt b/calculate.txt
index fa00814474f6..f936af1aaa26 100644
--- a/calculate.txt
+++ b/calculate.txt
@@ -7,7 +7,6 @@
'uri': 'git://git.calculate-linux.org/calculate/calculate-overlay.git'}],
'status': 'unofficial'}
$ pmaint sync calculate
-WARNING:pkgcore:HomeAssistantRepository repo at '/var/lib/repo-mirror-ci/sync/HomeAssistantRepository', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone).
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:
@@ -22,10 +21,14 @@ or --ff-only on the command line to override the configured default per
invocation.
From git://git.calculate-linux.org/calculate/calculate-overlay
- fb2e84275..7324505b2 develop -> origin/develop
- fb2e84275..7324505b2 mhiretskiy -> origin/mhiretskiy
- fb2e84275..7324505b2 update -> origin/update
-Already up to date.
+ fb2e84275..7324505b2 master -> origin/master
+ fb2e84275..7324505b2 master64 -> origin/master64
+ * [new tag] 2254 -> 2254
+Updating fb2e84275..7324505b2
+Fast-forward
+ .../3.6/6_ac_update_sync/revision/2020/20201117-rebuild_samba | 4 ++++
+ 1 file changed, 4 insertions(+)
+ create mode 100644 profiles/templates/3.6/6_ac_update_sync/revision/2020/20201117-rebuild_samba
*** syncing calculate
*** synced calculate
* Sync succeeded