Re: [Freeipa-devel] [PATCH] documentation fix for json_decode_binary
On 03/03/2010 01:19 AM, Martin Nagy wrote: NACK, this seems to be a patch for code that isn't even in the repository yet. BTW, how is one supposed to apply this patch? Saving the whole email didn't work for me, I had to hand edit it and git-am still complained. Right, this was superseded by "0003 Fix JSON binary encode and decode errors (rebase)". The patch didn't apply because the original "Fix JSON binary encode and decode errors" patch didn't apply because of a merge conflict. Patches have to be applied in order and when one gets skipped either because of review delay or merge conflict it can create problems. FWIW from this point forward all my patch submissions will be numbered. The numbering will be done via the --start-number argument to git format-patch combined with the -n argument to add the patch number to the subject-prefix. Thus for example my patch number 3 will show up with a subject which looks like this: [PATCH 3/3] xxx xxx xxx This is standard git notation. The first number specifies the beginning patch number in the sequence. The second number specifies the last patch number in the sequence. When there is only one patch in the email sequence both numbers are the same. This will always be the case for us because we don't generate multiple patches in a single email (at least not yet, however this is something the kernel team and others do) So lets say 3 is my next patch number the command to generate the patch email would look like this: git format-patch -n -start-number 3 -1 FWIW, I have a script which automates this, it maintains the sequence number in a file in the same directory which all my patches are written to. It's also capable of emailing the patch. -- John Dennis Looking to carve out IT costs? www.redhat.com/carveoutcosts/ ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
Re: [Freeipa-devel] [PATCH] documentation fix for json_decode_binary
NACK, this seems to be a patch for code that isn't even in the repository yet. BTW, how is one supposed to apply this patch? Saving the whole email didn't work for me, I had to hand edit it and git-am still complained. Martin On Tue, 2010-03-02 at 17:01 -0500, John Dennis wrote: > This is a multi-part message in MIME format. > --1.6.6.1 > Content-Type: text/plain; charset=UTF-8; format=fixed > Content-Transfer-Encoding: 8bit > > --- > ipaserver/rpcserver.py |4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > > --1.6.6.1 > Content-Type: text/x-patch; > name="0002-documentation-fix-for-json_decode_binary.patch" > Content-Transfer-Encoding: 8bit > Content-Disposition: attachment; > filename="0002-documentation-fix-for-json_decode_binary.patch" > > diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py > index 96c4d29..86bdf14 100644 > --- a/ipaserver/rpcserver.py > +++ b/ipaserver/rpcserver.py > @@ -278,8 +278,8 @@ def json_decode_binary(val): > binary value with the decoded binary value. Unlike the encoding problem > where the input might consist of immutable object, all JSON decoded > container are mutable so the conversion could be done in place. However > we > -don't modifying objects in place has side effects which may be > -dangerous. Thus we elect to spend a few more cycles and avoid the > +don't modify objects in place because that might have side effects which > may > +be dangerous. Thus we elect to spend a few more cycles and avoid the > possibility of unintended side effects in favor of robustness. > ''' > > > --1.6.6.1-- ___ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
