summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'calculate.txt')
-rw-r--r--calculate.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/calculate.txt b/calculate.txt
index 1cae5a35075b..7964c670b96f 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,9 +21,13 @@ or --ff-only on the command line to override the configured default per
invocation.
From git://git.calculate-linux.org/calculate/calculate-overlay
- d448c4ce2..0821b98b4 develop -> origin/develop
- d448c4ce2..0821b98b4 update -> origin/update
-Already up to date.
+ d448c4ce2..0821b98b4 master -> origin/master
+ d448c4ce2..0821b98b4 master64 -> origin/master64
+ * [new tag] 2270 -> 2270
+Updating d448c4ce2..0821b98b4
+Fast-forward
+ profiles/default/package.keywords/depends | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
*** syncing calculate
*** synced calculate
* Sync succeeded