diff options
Diffstat (limited to 'calculate.txt')
| -rw-r--r-- | calculate.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/calculate.txt b/calculate.txt index 959f31cd4ea8..ce6b2890ad68 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:SwordArMor repo at '/var/lib/repo-mirror-ci/sync/SwordArMor', 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 - bcbd15829..0055cf29a develop -> origin/develop - bcbd15829..0055cf29a update -> origin/update -Already up to date. + bcbd15829..0055cf29a master -> origin/master + bcbd15829..0055cf29a master64 -> origin/master64 + * [new tag] 2388 -> 2388 +Updating bcbd15829..0055cf29a +Fast-forward + profiles/default/package.keywords/depends | 2 -- + 1 file changed, 2 deletions(-) *** syncing calculate *** synced calculate * Sync succeeded |