<div dir="ltr">Instead full-sucrose-0.100:<div><br></div><div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<span class=""><font size="1">INFO:root:Running command git remote set-url origin git://<a href="http://github.com/sugarlabs/sugar-web.git">github.com/sugarlabs/sugar-web.git</a><br></font></span><span class=""><font size="1">INFO:root:Running: git remote set-url origin git://<a href="http://github.com/sugarlabs/sugar-web.git">github.com/sugarlabs/sugar-web.git</a><br>
</font></span><span class=""><font size="1">INFO:root:Running command git fetch<br></font></span><span class=""><font size="1">INFO:root:Running: git fetch<br></font></span><span class=""><font size="1">INFO:root:>From git://<a href="http://github.com/sugarlabs/sugar-web">github.com/sugarlabs/sugar-web</a><br>
</font></span><span class=""><font size="1">INFO:root: 0c0d809..e46a2c6 master -> origin/master<br></font></span><span class=""><font size="1"><font color="#000000" style="background-color:rgb(106,168,79)">INFO:root:Running command git checkout sucrose-0.100</font><br>
</font></span><span class=""><font size="1">INFO:root:Running: git checkout sucrose-0.100<br></font></span><span class=""><font size="1">INFO:root:Already on 'sucrose-0.100'<br></font></span><span class=""><font size="1">INFO:root:Running command git merge --ff-only origin/sucrose-0.100<br>
</font></span><span class=""><font size="1">INFO:root:Running: git merge --ff-only origin/sucrose-0.100<br></font></span><span class=""><font size="1">INFO:root:Already up-to-date.<br></font></span><span class=""><font size="1">INFO:root:sugar-web HEAD: d4632b00dcdd8b973480d0750c74579daa611e5d</font></span></blockquote>
<div><br></div><div>but fails for other reason:</div><div><a href="http://buildbot.sugarlabs.org/builders/full-sucrose-0.100/builds/45/steps/shell_3/logs/modules">http://buildbot.sugarlabs.org/builders/full-sucrose-0.100/builds/45/steps/shell_3/logs/modules</a><br>
</div><div> </div></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">2014/1/7 Rogelio Mita <span dir="ltr"><<a href="mailto:rogeliomita@activitycentral.com" target="_blank">rogeliomita@activitycentral.com</a>></span><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">sorry, this is correct pull log (build #142): <a href="http://buildbot.sugarlabs.org/builders/quick-sucrose-0.100/builds/142" target="_blank">http://buildbot.sugarlabs.org/builders/quick-sucrose-0.100/builds/142</a></div>
<div class="gmail_extra"><div><div class="h5">
<br><br><div class="gmail_quote">2014/1/7 Rogelio Mita <span dir="ltr"><<a href="mailto:rogeliomita@activitycentral.com" target="_blank">rogeliomita@activitycentral.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr"><div>I don't understand why sucrose-0.100 is pulling the "master" branch of sugar-web.</div><div><a href="https://github.com/sugarlabs/sugar-build/blob/sucrose-0.100/build/modules.json#L117" target="_blank">/build/modules.json</a> has set sucrose-0.100 branch for sugar-web.</div>
<div><br></div><div><a href="http://buildbot.sugarlabs.org/builders/quick-sucrose-0.100/builds/143/steps/shell/logs/log" target="_blank">pull log</a>:</div><div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<pre style="white-space:pre-wrap;font-family:'Courier New',courier,monotype,monospace"><span><font size="1">INFO:root:Running command git remote set-url origin git://<a href="http://github.com/sugarlabs/sugar-web.git" target="_blank">github.com/sugarlabs/sugar-web.git</a>
INFO:root:Running: git remote set-url origin git://<a href="http://github.com/sugarlabs/sugar-web.git" target="_blank">github.com/sugarlabs/sugar-web.git</a>
INFO:root:Running command git fetch
INFO:root:Running: git fetch
INFO:root:From git://<a href="http://github.com/sugarlabs/sugar-web" target="_blank">github.com/sugarlabs/sugar-web</a>
INFO:root: 0c0d809..e46a2c6 master -> origin/master
<span style="background-color:rgb(255,0,0)">INFO:root:Running command git checkout 139a0c161288f7652ce419d236e7bc4f45a7a2bc</span>
INFO:root:Running: git checkout 139a0c161288f7652ce419d236e7bc4f45a7a2bc
INFO:root:Note: checking out '139a0c161288f7652ce419d236e7bc4f45a7a2bc'.
INFO:root:
INFO:root:You are in 'detached HEAD' state. You can look around, make experimental
INFO:root:changes and commit them, and you can discard any commits you make in this
INFO:root:state without impacting any branches by performing another checkout.
INFO:root:
INFO:root:If you want to create a new branch to retain commits you create, you may
INFO:root:do so (now or later) by using -b with the checkout command again. Example:
INFO:root:
INFO:root: git checkout -b new_branch_name
INFO:root:
INFO:root:HEAD is now at 139a0c1... Moving datastore functional tests to separate file
INFO:root:sugar-web HEAD: 139a0c161288f7652ce419d236e7bc4f45a7a2bc</font></span></pre></blockquote></div><div>looks that HEAD had been with the master branch files?</div><span><font color="#888888"><div><br>
</div>-- <br>Roger<div><br><div><a href="http://activitycentral.com/" target="_blank">Activity Central</a></div>
</div>
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div></div></div><span class="HOEnZb"><font color="#888888">-- <br>Roger<div><br><div><a href="http://activitycentral.com/" target="_blank">Activity Central</a></div></div>
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br>Roger<div><br><div><a href="http://activitycentral.com/" target="_blank">Activity Central</a></div></div>
</div>