diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-18 14:32:58 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-18 14:32:58 +0000 |
| commit | cc235cb7939a9f7b6f334044120592a5ef2f20c3 (patch) | |
| tree | 8cbfe0e3db9d9cabf2054f18b54fd56caa328334 /science.html | |
| parent | 2021-01-18T13:00:01Z (diff) | |
| download | repos-cc235cb7939a9f7b6f334044120592a5ef2f20c3.tar.gz repos-cc235cb7939a9f7b6f334044120592a5ef2f20c3.tar.bz2 repos-cc235cb7939a9f7b6f334044120592a5ef2f20c3.zip | |
2021-01-18T14:00:01Z
Diffstat (limited to 'science.html')
| -rw-r--r-- | science.html | 112 |
1 files changed, 45 insertions, 67 deletions
diff --git a/science.html b/science.html index 78892484a99a..34d7aa4bca11 100644 --- a/science.html +++ b/science.html @@ -66,117 +66,95 @@ </pre></td></tr> <tr class="" id="l28"><td><a href="#l28"><span>28</span></a></td><td><pre>$ pmaint sync science </pre></td></tr> - <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is + <tr class="" id="l29"><td><a href="#l29"><span>29</span></a></td><td><pre>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). </pre></td></tr> - <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following + <tr class="" id="l30"><td><a href="#l30"><span>30</span></a></td><td><pre>warning: Pulling without specifying how to reconcile divergent branches is </pre></td></tr> - <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>commands sometime before your next pull: + <tr class="" id="l31"><td><a href="#l31"><span>31</span></a></td><td><pre>discouraged. You can squelch this message by running one of the following </pre></td></tr> - <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre> + <tr class="" id="l32"><td><a href="#l32"><span>32</span></a></td><td><pre>commands sometime before your next pull: </pre></td></tr> - <tr class="" id="l33"><td><a href="#l33"><span>33</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) + <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> git config pull.rebase true # rebase + <tr class="" id="l34"><td><a href="#l34"><span>34</span></a></td><td><pre> git config pull.rebase false # merge (the default strategy) </pre></td></tr> - <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> git config pull.ff only # fast-forward only + <tr class="" id="l35"><td><a href="#l35"><span>35</span></a></td><td><pre> git config pull.rebase true # rebase </pre></td></tr> - <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> + <tr class="" id="l36"><td><a href="#l36"><span>36</span></a></td><td><pre> git config pull.ff only # fast-forward only </pre></td></tr> - <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default + <tr class="" id="l37"><td><a href="#l37"><span>37</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, + <tr class="" id="l38"><td><a href="#l38"><span>38</span></a></td><td><pre>You can replace "git config" with "git config --global" to set a default </pre></td></tr> - <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>or --ff-only on the command line to override the configured default per + <tr class="" id="l39"><td><a href="#l39"><span>39</span></a></td><td><pre>preference for all repositories. You can also pass --rebase, --no-rebase, </pre></td></tr> - <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>invocation. + <tr class="" id="l40"><td><a href="#l40"><span>40</span></a></td><td><pre>or --ff-only on the command line to override the configured default per </pre></td></tr> - <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre> + <tr class="" id="l41"><td><a href="#l41"><span>41</span></a></td><td><pre>invocation. </pre></td></tr> - <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre>From https://anongit.gentoo.org/git/proj/sci + <tr class="" id="l42"><td><a href="#l42"><span>42</span></a></td><td><pre> </pre></td></tr> - <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre> 9290e3ac6..ee247b86d master -> origin/master + <tr class="" id="l43"><td><a href="#l43"><span>43</span></a></td><td><pre>From https://anongit.gentoo.org/git/proj/sci </pre></td></tr> - <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre>Updating 9290e3ac6..ee247b86d + <tr class="" id="l44"><td><a href="#l44"><span>44</span></a></td><td><pre> ee247b86d..ae869079e master -> origin/master </pre></td></tr> - <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Fast-forward + <tr class="" id="l45"><td><a href="#l45"><span>45</span></a></td><td><pre>Updating ee247b86d..ae869079e </pre></td></tr> - <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre> profiles/package.mask | 8 -- + <tr class="" id="l46"><td><a href="#l46"><span>46</span></a></td><td><pre>Fast-forward </pre></td></tr> - <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> sci-biology/VelvetOptimiser/Manifest | 2 +- + <tr class="" id="l47"><td><a href="#l47"><span>47</span></a></td><td><pre> profiles/package.mask | 5 ----- </pre></td></tr> - <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> ...r-2.2.5.ebuild => VelvetOptimiser-2.2.6.ebuild} | 14 +- + <tr class="" id="l48"><td><a href="#l48"><span>48</span></a></td><td><pre> sci-biology/TransDecoder/Manifest | 2 +- </pre></td></tr> - <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> sci-biology/vague-bin/vague-bin-1.0.5.ebuild | 17 ++- + <tr class="" id="l49"><td><a href="#l49"><span>49</span></a></td><td><pre> ...oder-2.1.0.ebuild => TransDecoder-5.5.0.ebuild} | 13 ++++++----- </pre></td></tr> - <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> sci-biology/wcd/Manifest | 2 +- + <tr class="" id="l50"><td><a href="#l50"><span>50</span></a></td><td><pre> .../files/TransDecoder-2.1.0__fix_paths.patch | 22 ------------------ </pre></td></tr> - <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> sci-biology/wcd/wcd-0.6.3.ebuild | 62 --------- + <tr class="" id="l51"><td><a href="#l51"><span>51</span></a></td><td><pre> sci-biology/ffindex/Manifest | 2 +- </pre></td></tr> - <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> sci-biology/wcd/wcd-0.6.3_p20180430.ebuild | 48 +++++++ + <tr class="" id="l52"><td><a href="#l52"><span>52</span></a></td><td><pre> .../{ffindex-0.9.9.6.ebuild => ffindex-1.0.ebuild} | 13 +++++------ </pre></td></tr> - <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> sci-biology/wgs_tools/Manifest | 4 +- + <tr class="" id="l53"><td><a href="#l53"><span>53</span></a></td><td><pre> sci-biology/tablet-bin/Manifest | 2 +- </pre></td></tr> - <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> sci-biology/wgs_tools/wgs_tools-9999.ebuild | 11 +- + <tr class="" id="l54"><td><a href="#l54"><span>54</span></a></td><td><pre> ...7.08.17.ebuild => tablet-bin-1.20.12.24.ebuild} | 15 ++++++------- </pre></td></tr> - <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> sci-chemistry/camshift/Manifest | 1 - + <tr class="" id="l55"><td><a href="#l55"><span>55</span></a></td><td><pre> sci-biology/trim_galore/Manifest | 2 +- </pre></td></tr> - <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> sci-chemistry/camshift/camshift-1.35.0.ebuild | 51 ------- + <tr class="" id="l56"><td><a href="#l56"><span>56</span></a></td><td><pre> sci-biology/trim_galore/trim_galore-0.4.0.ebuild | 26 ---------------------- </pre></td></tr> - <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> sci-chemistry/camshift/files/1.35.0-gcc47.patch | 148 --------------------- + <tr class="" id="l57"><td><a href="#l57"><span>57</span></a></td><td><pre> sci-biology/trim_galore/trim_galore-0.6.6.ebuild | 26 ++++++++++++++++++++++ </pre></td></tr> - <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> sci-chemistry/camshift/files/1.35.0-gentoo.patch | 85 ------------ + <tr class="" id="l58"><td><a href="#l58"><span>58</span></a></td><td><pre> sci-biology/twinscan/Manifest | 2 +- </pre></td></tr> - <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> sci-chemistry/camshift/metadata.xml | 8 -- + <tr class="" id="l59"><td><a href="#l59"><span>59</span></a></td><td><pre> sci-biology/twinscan/twinscan-4.1.2-r1.ebuild | 21 ++++++++++------- </pre></td></tr> - <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> sci-chemistry/dssp2pdb/Manifest | 1 - + <tr class="" id="l60"><td><a href="#l60"><span>60</span></a></td><td><pre> 13 files changed, 64 insertions(+), 87 deletions(-) </pre></td></tr> - <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> sci-chemistry/dssp2pdb/dssp2pdb-0.03.ebuild | 24 ---- + <tr class="" id="l61"><td><a href="#l61"><span>61</span></a></td><td><pre> rename sci-biology/TransDecoder/{TransDecoder-2.1.0.ebuild => TransDecoder-5.5.0.ebuild} (88%) </pre></td></tr> - <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> sci-chemistry/dssp2pdb/metadata.xml | 8 -- + <tr class="" id="l62"><td><a href="#l62"><span>62</span></a></td><td><pre> delete mode 100644 sci-biology/TransDecoder/files/TransDecoder-2.1.0__fix_paths.patch </pre></td></tr> - <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> sci-chemistry/mddnmr/Manifest | 2 +- + <tr class="" id="l63"><td><a href="#l63"><span>63</span></a></td><td><pre> rename sci-biology/ffindex/{ffindex-0.9.9.6.ebuild => ffindex-1.0.ebuild} (75%) </pre></td></tr> - <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> .../{mddnmr-2.4-r1.ebuild => mddnmr-2.7.ebuild} | 11 +- + <tr class="" id="l64"><td><a href="#l64"><span>64</span></a></td><td><pre> rename sci-biology/tablet-bin/{tablet-bin-1.17.08.17.ebuild => tablet-bin-1.20.12.24.ebuild} (89%) </pre></td></tr> - <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> 19 files changed, 79 insertions(+), 428 deletions(-) + <tr class="" id="l65"><td><a href="#l65"><span>65</span></a></td><td><pre> delete mode 100644 sci-biology/trim_galore/trim_galore-0.4.0.ebuild </pre></td></tr> - <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> rename sci-biology/VelvetOptimiser/{VelvetOptimiser-2.2.5.ebuild => VelvetOptimiser-2.2.6.ebuild} (64%) + <tr class="" id="l66"><td><a href="#l66"><span>66</span></a></td><td><pre> create mode 100644 sci-biology/trim_galore/trim_galore-0.6.6.ebuild </pre></td></tr> - <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre> delete mode 100644 sci-biology/wcd/wcd-0.6.3.ebuild + <tr class="" id="l67"><td><a href="#l67"><span>67</span></a></td><td><pre>*** syncing science </pre></td></tr> - <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre> create mode 100644 sci-biology/wcd/wcd-0.6.3_p20180430.ebuild + <tr class="" id="l68"><td><a href="#l68"><span>68</span></a></td><td><pre>*** synced science </pre></td></tr> - <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> delete mode 100644 sci-chemistry/camshift/Manifest + <tr class="" id="l69"><td><a href="#l69"><span>69</span></a></td><td><pre> * Sync succeeded </pre></td></tr> - <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre> delete mode 100644 sci-chemistry/camshift/camshift-1.35.0.ebuild + <tr class="" id="l70"><td><a href="#l70"><span>70</span></a></td><td><pre>$ git log --format=%ci -1 </pre></td></tr> - <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre> delete mode 100644 sci-chemistry/camshift/files/1.35.0-gcc47.patch + <tr class="" id="l71"><td><a href="#l71"><span>71</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD </pre></td></tr> - <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre> delete mode 100644 sci-chemistry/camshift/files/1.35.0-gentoo.patch + <tr class="" id="l72"><td><a href="#l72"><span>72</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 science </pre></td></tr> - <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> delete mode 100644 sci-chemistry/camshift/metadata.xml -</pre></td></tr> - <tr class="" id="l74"><td><a href="#l74"><span>74</span></a></td><td><pre> delete mode 100644 sci-chemistry/dssp2pdb/Manifest -</pre></td></tr> - <tr class="" id="l75"><td><a href="#l75"><span>75</span></a></td><td><pre> delete mode 100644 sci-chemistry/dssp2pdb/dssp2pdb-0.03.ebuild -</pre></td></tr> - <tr class="" id="l76"><td><a href="#l76"><span>76</span></a></td><td><pre> delete mode 100644 sci-chemistry/dssp2pdb/metadata.xml -</pre></td></tr> - <tr class="" id="l77"><td><a href="#l77"><span>77</span></a></td><td><pre> rename sci-chemistry/mddnmr/{mddnmr-2.4-r1.ebuild => mddnmr-2.7.ebuild} (87%) -</pre></td></tr> - <tr class="" id="l78"><td><a href="#l78"><span>78</span></a></td><td><pre>*** syncing science -</pre></td></tr> - <tr class="" id="l79"><td><a href="#l79"><span>79</span></a></td><td><pre>*** synced science -</pre></td></tr> - <tr class="" id="l80"><td><a href="#l80"><span>80</span></a></td><td><pre> * Sync succeeded -</pre></td></tr> - <tr class="" id="l81"><td><a href="#l81"><span>81</span></a></td><td><pre>$ git log --format=%ci -1 -</pre></td></tr> - <tr class="" id="l82"><td><a href="#l82"><span>82</span></a></td><td><pre>$ git show -q --pretty=format:%G? HEAD -</pre></td></tr> - <tr class="" id="l83"><td><a href="#l83"><span>83</span></a></td><td><pre>$ pmaint regen --use-local-desc --pkg-desc-index -t 1 science -</pre></td></tr> - <tr class="" id="l84"><td><a href="#l84"><span>84</span></a></td><td><pre> * Cache regenerated successfully + <tr class="" id="l73"><td><a href="#l73"><span>73</span></a></td><td><pre> * Cache regenerated successfully </pre></td></tr> </table> |