summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'calculate.html')
-rw-r--r--calculate.html42
1 files changed, 34 insertions, 8 deletions
diff --git a/calculate.html b/calculate.html
index 870546f2ab44..a67bb0ae7da3 100644
--- a/calculate.html
+++ b/calculate.html
@@ -28,21 +28,47 @@
</pre></td></tr>
<tr class="" id="l9"><td><a href="#l9"><span>9</span></a></td><td><pre>$ pmaint sync calculate
</pre></td></tr>
- <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>Already up to date.
+ <tr class="" id="l10"><td><a href="#l10"><span>10</span></a></td><td><pre>From git://git.calculate.ru/calculate/overlay
</pre></td></tr>
- <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre>*** syncing calculate
+ <tr class="" id="l11"><td><a href="#l11"><span>11</span></a></td><td><pre> faf2d02da..6c8b06c76 master -&gt; origin/master
</pre></td></tr>
- <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre>*** synced calculate
+ <tr class="" id="l12"><td><a href="#l12"><span>12</span></a></td><td><pre> faf2d02da..6c8b06c76 develop -&gt; origin/develop
</pre></td></tr>
- <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> * Sync succeeded
+ <tr class="" id="l13"><td><a href="#l13"><span>13</span></a></td><td><pre> faf2d02da..6c8b06c76 master64 -&gt; origin/master64
</pre></td></tr>
- <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l14"><td><a href="#l14"><span>14</span></a></td><td><pre> faf2d02da..6c8b06c76 mhiretskiy -&gt; origin/mhiretskiy
</pre></td></tr>
- <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l15"><td><a href="#l15"><span>15</span></a></td><td><pre> faf2d02da..6c8b06c76 update -&gt; origin/update
</pre></td></tr>
- <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 calculate
+ <tr class="" id="l16"><td><a href="#l16"><span>16</span></a></td><td><pre> * [new tag] 2080 -&gt; 2080
</pre></td></tr>
- <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre> * Cache regenerated successfully
+ <tr class="" id="l17"><td><a href="#l17"><span>17</span></a></td><td><pre>Updating faf2d02da..6c8b06c76
+</pre></td></tr>
+ <tr class="" id="l18"><td><a href="#l18"><span>18</span></a></td><td><pre>Fast-forward
+</pre></td></tr>
+ <tr class="" id="l19"><td><a href="#l19"><span>19</span></a></td><td><pre> .../sys-apps/calculate-utils/.calculate_directory | 1 +
+</pre></td></tr>
+ <tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre> .../3.6/6_ac_update_sync/revision/2020/20200529.3-remove_trash | 6 ++++++
+</pre></td></tr>
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre> 2 files changed, 7 insertions(+)
+</pre></td></tr>
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre> create mode 100644 profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/.calculate_directory
+</pre></td></tr>
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre> create mode 100644 profiles/templates/3.6/6_ac_update_sync/revision/2020/20200529.3-remove_trash
+</pre></td></tr>
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>*** syncing calculate
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>*** synced calculate
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre> * Sync succeeded
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>$ git log --format=%ci -1
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 calculate
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre> * Cache regenerated successfully
</pre></td></tr>
</table>