<div dir="ltr">Good explanation, probably useful include it in the docs<div><br></div><div style>Gonzalo <br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Jun 17, 2013 at 7:10 AM, Daniel Narvaez <span dir="ltr"><<a href="mailto:dwnarvaez@gmail.com" target="_blank">dwnarvaez@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div><div>Let's say I made a sugar fork. This will make sugar-build pull from it<br><br>dnarvaez@dnarvaez:~/sugar-build$ cat prefs.json <br>
{<br> "github": {<br> "forks": [<br>
"dnarvaez/sugar.git"<br> ]<br> }<br>}<br>dnarvaez@dnarvaez:~/sugar-build$ rm -rf sugar<br>dnarvaez@dnarvaez:~/sugar-build$ ./osbuild pull sugar<br>* Pulling sugar<br><br></div>Now if I want to pull changes from upstream and update my fork (well, mine was already uptodate but...)<br>
<br>dnarvaez@dnarvaez:~/sugar-build/sugar$ git fetch upstream<br>From git://<a href="http://github.com/sugarlabs/sugar" target="_blank">github.com/sugarlabs/sugar</a><br> * [new branch] html -> upstream/html<br>
* [new branch] html2 -> upstream/html2<br>
* [new branch] master -> upstream/master<br> * [new branch] sucrose-0.82 -> upstream/sucrose-0.82<br> * [new branch] sucrose-0.84 -> upstream/sucrose-0.84<br> * [new branch] sucrose-0.86 -> upstream/sucrose-0.86<br>
* [new branch] sucrose-0.88 -> upstream/sucrose-0.88<br> * [new branch] sucrose-0.90 -> upstream/sucrose-0.90<br> * [new branch] sucrose-0.92 -> upstream/sucrose-0.92<br> * [new branch] sucrose-0.94 -> upstream/sucrose-0.94<br>
* [new branch] sucrose-0.96 -> upstream/sucrose-0.96<br> * [new branch] sucrose-0.98 -> upstream/sucrose-0.98<br> * [new branch] tableview -> upstream/tableview<br>dnarvaez@dnarvaez:~/sugar-build/sugar$ git merge upstream/master<br>
Already up-to-date.<br>dnarvaez@dnarvaez:~/sugar-build/sugar$ git push<br>Everything up-to-date<br><br></div>Finally, if I have write access to the official repository I can set it up like this<br><br>{<br> "github": {<br>
"forks": [<br> "dnarvaez/sugar.git"<br> ],<br> "ssh": [<br> "sugarlabs/sugar.git"<br> ]<br> }<br>}<br><br><div><div>So when I want to push someone else patch to the official repo I just<br>
<br></div><div>git push upstream<br></div><div><br></div></div></div><div class="gmail_extra"><div><div class="h5"><br><br><div class="gmail_quote">On 16 June 2013 21:56, Gonzalo Odiard <span dir="ltr"><<a href="mailto:gonzalo@laptop.org" target="_blank">gonzalo@laptop.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">How should be the use in this case, can we set our repo forked in github,<div>and sugar-build will update from there?</div>
<div><br></div><div>Btw, great job with <a href="http://developer.sugarlabs.org" target="_blank">developer.sugarlabs.org</a></div>
<div><br></div><div>Gonzalo</div></div><div class="gmail_extra"><br><br><div class="gmail_quote"><div><div>On Sun, Jun 16, 2013 at 11:09 AM, Daniel Narvaez <span dir="ltr"><<a href="mailto:dwnarvaez@gmail.com" target="_blank">dwnarvaez@gmail.com</a>></span> wrote:<br>
</div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div><div dir="ltr">I added a pref to automatically setup remotes for github forks and ssh. This follows github docs recommended approach.<br>
<br><a href="http://developer.sugarlabs.org/dev-environment.md.html#github" target="_blank">http://developer.sugarlabs.org/dev-environment.md.html#github</a><span><font color="#888888"><br clear="all">
<br>-- <br>Daniel Narvaez<br>
</font></span></div>
<br></div></div>_______________________________________________<br>
Sugar-devel mailing list<br>
<a href="mailto:Sugar-devel@lists.sugarlabs.org" target="_blank">Sugar-devel@lists.sugarlabs.org</a><br>
<a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a><br>
<br></blockquote></div><br></div>
</blockquote></div><br><br clear="all"><br></div></div><span class="HOEnZb"><font color="#888888">-- <br>Daniel Narvaez<br>
</font></span></div>
</blockquote></div><br></div>