rid backend seems to be initialized twice?

Gerald (Jerry) Carter jerry at samba.org
Fri Oct 12 12:43:43 GMT 2007


>> ## cherry pick the HEAD commit from v3-0-test
>> $ git-checkout -b v3-2-test origin/v3-2-test
>> $ git-cherry-pick \
>>   `git-log --pretty=one origin/v3-0-test | awk '{print $1}'`
> The file was moved from nsswitch/idmap.c to winbind/idmap.c, If I use
> git-cherry-pick to pick only the specific hash that identify my patch,
> it recognizes something happened, but insted of patching the right file
> it creates a complete new nsswitch/idmap.c file ?

Ahh...Another reason to avoid useless file renames :-)

> Is there something I should do? Or is there no other 
> way but simply diff and patch the new file manually
> and basically create a new commit

$ git-show -p $hash | patch -p1


More information about the samba-technical mailing list