diff options
Diffstat (limited to 'distros.txt')
| -rw-r--r-- | distros.txt | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/distros.txt b/distros.txt index 348509bd0758..a034f5efad0b 100644 --- a/distros.txt +++ b/distros.txt @@ -7,7 +7,6 @@ 'uri': 'git://git.calculate-linux.org/calculate/distros-overlay.git'}], 'status': 'unofficial'} $ pmaint sync distros -WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', 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,17 +21,17 @@ or --ff-only on the command line to override the configured default per invocation. From git://git.calculate-linux.org/calculate/distros-overlay - a32161b..febf702 master -> origin/master - a32161b..febf702 master64 -> origin/master64 - a32161b..febf702 update -> origin/update - * [new tag] 346 -> 346 -Updating a32161b..febf702 + febf702..351e961 master -> origin/master + febf702..351e961 develop -> origin/develop + febf702..351e961 master64 -> origin/master64 + febf702..351e961 update -> origin/update + * [new tag] 347 -> 347 +Updating febf702..351e961 Fast-forward - profiles/templates/3.5/6_ac_update_sync/world/0-ini | 2 +- - profiles/templates/3.5/6_ac_update_sync/world/create/xfce | 1 - - profiles/templates/3.5/6_ac_update_sync/world/update/2020/20201230 | 7 +++++++ - 3 files changed, 8 insertions(+), 2 deletions(-) - create mode 100644 profiles/templates/3.5/6_ac_update_sync/world/update/2020/20201230 + profiles/templates/3.5/6_ac_update_sync/world/0-ini | 2 +- + .../3.5/6_ac_update_sync/world/update/2020/{20201230 => 20201230.1} | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + rename profiles/templates/3.5/6_ac_update_sync/world/update/2020/{20201230 => 20201230.1} (78%) *** syncing distros *** synced distros * Sync succeeded |