<br><br><div class="gmail_quote">On Sun, Feb 7, 2010 at 6:01 AM, Matteo Bernardini <span dir="ltr"><<a href="mailto:matteo.bernardini@sns.it">matteo.bernardini@sns.it</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Il 06/02/2010 22:03, Ozan Türkyılmaz ha scritto:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
06.02.2010 22:57, Robby Workman yazmış:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"><div class="im">
On Sun, 31 Jan 2010 12:17:59 +0100<br>
Matteo Bernardini<<a href="mailto:matteo.bernardini@sns.it" target="_blank">matteo.bernardini@sns.it</a>> wrote:<br>
<br></div><div class="im">
If you wanted the diffs to be more usable (and I'm not saying<br>
that you *should* - this is just an *if*), then you'd want to<br>
structure the commits such that each commit only touched one<br>
application. As an example:<br>
<br>
Bring<appname> up to snuff for -current<br>
<br>
* fixup includes<br>
* fixup build for gcc4<br>
<br>
Is it a lot more work to do that? Probably. Is it worth it<br>
for just your use? Probably not. Would *I* do it anyway?<br>
Yes. The rest is up to you. :-)<br>
<br>
</div></blockquote>
<br>
i use this method in my repos; per commit per file or per commit per feature. it makes revent easy and sending diffs or doing cherry-pick much easier and less problematic.<br>
<br>
fixup for bug #no<br>
foo_bar() is here<br>
and such pay is nice, too.<br>
<br>
</blockquote>
I thought I was doing it already, besides an initial accomodation with git :D<br>
<br>
yes, maybe it's better if I start from scratch, then (let's see if I understand what you mean):<br>
(remote is github in the example)<br>
<br>
(1)<br>
- initialize git repo<br>
- git tag -a 20100207 -m "SBo at 20100207"<br>
- git push github<br>
- git push github --tags<br>
<br>
(2)<br>
- git checkout 20100207<br>
- git checkout -b myapp<br>
- modify files in 13.0/*/myapp folder<br>
- remove 13.0/*/myapp.tar.gz and 13.0/*/myapp.tar.gz.asc (sbopkg decompresses these)<br>
- create from 13.0/*/myapp folder 13.0/*/myapp.tgz<br>
- git commit -a -m "updated app"<br>
- git push github myapp<br>
- git checkout master<br>
- git merge myapp<br></blockquote><div>try: git merge --squash myapp<br>(I think that's what they're talking about.) <br></div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
- git push github<br>
<br>
and again from (2) for every myapp.<br>
<br>
any thought on improving above for easyness of use is warmly welcomed :)<br><font color="#888888">
<br>
-- <br>
Matteo Bernardini<br>
Centro di Elaborazione dell'Informazione e del Calcolo<br>
Scuola Normale Superiore<br>
Tel. 050-509338</font><div><div></div><div class="h5"><br>
<br>
_______________________________________________<br>
SlackBuilds-users mailing list<br>
<a href="mailto:SlackBuilds-users@slackbuilds.org" target="_blank">SlackBuilds-users@slackbuilds.org</a><br>
<a href="http://lists.slackbuilds.org/mailman/listinfo/slackbuilds-users" target="_blank">http://lists.slackbuilds.org/mailman/listinfo/slackbuilds-users</a><br>
Archives - <a href="http://lists.slackbuilds.org/pipermail/slackbuilds-users/" target="_blank">http://lists.slackbuilds.org/pipermail/slackbuilds-users/</a><br>
FAQ - <a href="http://slackbuilds.org/faq/" target="_blank">http://slackbuilds.org/faq/</a><br>
<br>
</div></div></blockquote></div><br>