olc/mmr-patches

[Oliver Liebel]

Andrew Bartlett schrieb:
> On Tue, 2009-02-24 at 09:58 +0100, Oliver Liebel wrote:
>   
>> Andrew Bartlett schrieb:
>>     
>>> On Mon, 2009-02-23 at 20:04 +0100, Oliver Liebel wrote:
>>>   
>>>       
>>>> hi andrew,
>>>>
>>>> i hope, the following descriptions of all made modifications/additions and
>>>> extensions are clear enough, and that i have created the commit-message 
>>>> in the right way.
>>>> otherwise please give me a short help / advice, and i will correct them 
>>>> according
>>>> to your specifications.
>>>>     
>>>>         
>>> The best way to create patches is to use git format-patch
>>>
>>> So, if you create 3 commits on top of the git tree with your changes,
>>> you can then run:
>>>
>>> git format-patch -3
>>>
>>> And forward me and the list the output.  That makes it really easy for
>>> me to apply it correctly.  
>>>
>>> Andrew Bartlett 
>>>   
>>>       
>> sorry, i am not very familiar with git.
>>     
>
> Ahh, that makes more sense now. 
>
> How have you been checking out Samba4 for your testing?
>
> Anyway, for an introduction to git see:
> http://wiki.samba.org/index.php/Using_Git_for_Samba_Development
>
> The branch to checkout is 'master'. 
>
>   
>> the complete patch includes 2 diffs and about 12 config/ldif files.
>> do i have to run the command above for every single file?
>>     
>
> The basic pattern once you have a local git checkout is:
>
> git add <all new and changed files for this commit>
> git commit
> (then provide a commit message)
>
> repeat for each commit you wish to create
>
> Then run git format-patch -3 (if you created 3 commits)
>
> Mail me the result.
>
>   
>> the only output i get when running "git format-patch" is:
>>
>> error: object directory /data/git/samba.git/objects does not exist;
>> check .git/objects/info/alternates.
>> fatal: bad object HEAD
>>     
>
> Yeah, that's because you are not in a git checkout.
>
> If it's all too much then I'll happily do it for you, but I wanted to
> give you the chance to set up properly, so we can both work more easily
> in future.
>   
thanks for your quick response.
because i am running out of time with other projects at the moment, it
would be
really the best (for this time) if you could apply my patches and diffs
in the
right way. i promise, will upgrade my git-knowledge later, when i have more
time ;-)

please tell me, how do you need the patches an diffs?
e.g.:    file: (function/description of changes etc.)

thanks
oliver
> Thanks,
>
> Andrew Bartlett
>
>