summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2022-07-02 09:46:20 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2022-07-02 09:46:20 +0000
commit3066fb469a78444d6f79ec15a6246d78dab491d9 (patch)
tree7da179ee067fbe3c55ad58a5b3a36af7b4dee5a1 /mv.html
parent2022-07-02T09:30:01Z (diff)
downloadrepos-3066fb469a78444d6f79ec15a6246d78dab491d9.tar.gz
repos-3066fb469a78444d6f79ec15a6246d78dab491d9.tar.bz2
repos-3066fb469a78444d6f79ec15a6246d78dab491d9.zip
2022-07-02T09:45:01Z
Diffstat (limited to 'mv.html')
-rw-r--r--mv.html62
1 files changed, 43 insertions, 19 deletions
diff --git a/mv.html b/mv.html
index 1f3ed8126280..6f2df7de713a 100644
--- a/mv.html
+++ b/mv.html
@@ -50,43 +50,67 @@
</pre></td></tr>
<tr class="" id="l20"><td><a href="#l20"><span>20</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mv
</pre></td></tr>
- <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>*** syncing mv
+ <tr class="" id="l21"><td><a href="#l21"><span>21</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>fatal: unable to access &#x27;https://anongit.gentoo.org/git/user/mv.git/&#x27;: Could not resolve host: anongit.gentoo.org
+ <tr class="" id="l22"><td><a href="#l22"><span>22</span></a></td><td><pre>WARNING:pkgcore:mv repo at &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>!!! failed syncing mv
+ <tr class="" id="l23"><td><a href="#l23"><span>23</span></a></td><td><pre>*** syncing mv
</pre></td></tr>
- <tr class="err" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre> * Sync failed with 1
+ <tr class="" id="l24"><td><a href="#l24"><span>24</span></a></td><td><pre>There is no tracking information for the current branch.
+</pre></td></tr>
+ <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre>Please specify which branch you want to merge with.
+</pre></td></tr>
+ <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>See git-pull(1) for details.
+</pre></td></tr>
+ <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre> git pull &lt;remote&gt; &lt;branch&gt;
+</pre></td></tr>
+ <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>If you wish to set tracking information for this branch you can do so with:
+</pre></td></tr>
+ <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> git branch --set-upstream-to=origin/&lt;branch&gt; master
+</pre></td></tr>
+ <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>
+</pre></td></tr>
+ <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>!!! failed syncing mv
+</pre></td></tr>
+ <tr class="err" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> * Sync failed with 1
</pre></td><td>[FATAL]</td></tr>
- <tr class="" id="l25"><td><a href="#l25"><span>25</span></a></td><td><pre> * Will try to re-create
+ <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> * Will try to re-create
+</pre></td></tr>
+ <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mv
</pre></td></tr>
- <tr class="" id="l26"><td><a href="#l26"><span>26</span></a></td><td><pre>$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync mv
+ <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>WARNING:pkgcore:java repo at &#x27;/var/lib/repo-mirror-ci/sync/java&#x27;, doesn&#x27;t specify masters in metadata/layout.conf. Please explicitly set masters (use &quot;masters =&quot; if the repo is standalone).
</pre></td></tr>
- <tr class="" id="l27"><td><a href="#l27"><span>27</span></a></td><td><pre>*** syncing mv
+ <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>*** syncing mv
</pre></td></tr>
- <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;...
+ <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>Cloning into &#x27;/var/lib/repo-mirror-ci/sync/mv&#x27;...
</pre></td></tr>
- <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>warning: remote HEAD refers to nonexistent ref, unable to checkout.
+ <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>warning: remote HEAD refers to nonexistent ref, unable to checkout.
</pre></td></tr>
- <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>
+ <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>
</pre></td></tr>
- <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>*** synced mv
+ <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>*** synced mv
</pre></td></tr>
- <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> * Sync succeeded after re-adding
+ <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> * Sync succeeded after re-adding
</pre></td></tr>
- <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre>$ git log --format=%ci -1
+ <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>$ git log --format=%ci -1
</pre></td></tr>
- <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre>fatal: your current branch &#x27;master&#x27; does not have any commits yet
+ <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>fatal: your current branch &#x27;master&#x27; does not have any commits yet
</pre></td></tr>
- <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
+ <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD
</pre></td></tr>
- <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre>fatal: ambiguous argument &#x27;HEAD&#x27;: unknown revision or path not in the working tree.
+ <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre>fatal: ambiguous argument &#x27;HEAD&#x27;: unknown revision or path not in the working tree.
</pre></td></tr>
- <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>Use &#x27;--&#x27; to separate paths from revisions, like this:
+ <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre>Use &#x27;--&#x27; to separate paths from revisions, like this:
</pre></td></tr>
- <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>&#x27;git &lt;command&gt; [&lt;revision&gt;...] -- [&lt;file&gt;...]&#x27;
+ <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre>&#x27;git &lt;command&gt; [&lt;revision&gt;...] -- [&lt;file&gt;...]&#x27;
</pre></td></tr>
- <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre> * Missing profiles/repo_name, removing
+ <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> * Missing profiles/repo_name, removing
</pre></td></tr>
</table>