[Freeipa-devel] [PATCH] Add more manpages

Stephen Gallagher sgallagh at redhat.com
Fri May 29 14:19:54 UTC 2009


On 05/29/2009 09:16 AM, Stephen Gallagher wrote:
> On 05/29/2009 09:15 AM, Jakub Hrozek wrote:
>> On Fri, 2009-05-29 at 08:43 -0400, Stephen Gallagher wrote:
>>> Squash them together. There's no real benefit to having them separate.
>> Done and attached.
>>
>> Jakub
> 
> Ack
> 
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Freeipa-devel mailing list
> Freeipa-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/freeipa-devel

I'm rescinding my ack. I reviewed that the changes had been merged, but
I just now attempted to apply this patch and git gives the following errors:

[sgallagh at sgallagh providers (master)]$ git am
/tmp/0001-Add-more-manpages.patch
Applying: Add more manpages
/home/sgallagh/workspace/sssd/.git/rebase-apply/patch:27: trailing
whitespace.
dist_man_MANS = man/sss_useradd.8 man/sss_userdel.8 man/sss_usermod.8 \
/home/sgallagh/workspace/sssd/.git/rebase-apply/patch:28: trailing
whitespace.
		man/sss_groupadd.8 man/sss_groupdel.8 man/sss_groupmod.8 \
/home/sgallagh/workspace/sssd/.git/rebase-apply/patch:29: trailing
whitespace.
		man/sssd.8
fatal: git apply: bad git-diff - expected /dev/null on line 36
Patch failed at 0001 Add more manpages
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


-- 
Stephen Gallagher
RHCE 804006346421761

Looking to carve out IT costs?
www.redhat.com/carveoutcosts/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3258 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20090529/26bc5876/attachment.p7s>


More information about the Freeipa-devel mailing list