[Slackbuilds-users] experimenting with git

[Dragon Wisard]

On Sun, Feb 7, 2010 at 6:01 AM, Matteo Bernardini
<matteo.bernardini at sns.it>wrote:

> Il 06/02/2010 22:03, Ozan Türkyılmaz ha scritto:
>
>> 06.02.2010 22:57, Robby Workman yazmış:
>>
>>> On Sun, 31 Jan 2010 12:17:59 +0100
>>> Matteo Bernardini<matteo.bernardini at sns.it>  wrote:
>>>
>>> If you wanted the diffs to be more usable (and I'm not saying
>>> that you *should* - this is just an *if*), then you'd want to
>>> structure the commits such that each commit only touched one
>>> application.  As an example:
>>>
>>>   Bring<appname>  up to snuff for -current
>>>
>>>     * fixup includes
>>>     * fixup build for gcc4
>>>
>>> Is it a lot more work to do that?  Probably.  Is it worth it
>>> for just your use?  Probably not.  Would *I* do it anyway?
>>> Yes.  The rest is up to you.  :-)
>>>
>>>
>> 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.
>>
>> fixup for bug #no
>> foo_bar() is here
>> and such pay is nice, too.
>>
>>  I thought I was doing it already, besides an initial accomodation with
> git :D
>
> yes, maybe it's better if I start from scratch, then (let's see if I
> understand what you mean):
> (remote is github in the example)
>
> (1)
> - initialize git repo
> - git tag -a 20100207 -m "SBo at 20100207"
> - git push github
> - git push github --tags
>
> (2)
> - git checkout 20100207
> - git checkout -b myapp
> - modify files in 13.0/*/myapp folder
> - remove 13.0/*/myapp.tar.gz and 13.0/*/myapp.tar.gz.asc (sbopkg
> decompresses these)
> - create from 13.0/*/myapp folder 13.0/*/myapp.tgz
> - git commit -a -m "updated app"
> - git push github myapp
> - git checkout master
> - git merge myapp
>
try: git merge --squash myapp
(I think that's what they're talking about.)

> - git push github
>
> and again from (2) for every myapp.
>
> any thought on improving above for easyness of use is warmly welcomed :)
>
> --
> Matteo Bernardini
> Centro di Elaborazione dell'Informazione e del Calcolo
> Scuola Normale Superiore
> Tel. 050-509338
>
>
> _______________________________________________
> SlackBuilds-users mailing list
> SlackBuilds-users at slackbuilds.org
> http://lists.slackbuilds.org/mailman/listinfo/slackbuilds-users
> Archives - http://lists.slackbuilds.org/pipermail/slackbuilds-users/
> FAQ - http://slackbuilds.org/faq/
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.slackbuilds.org/pipermail/slackbuilds-users/attachments/20100207/5e386b35/attachment-0001.htm>