On 06/21/2010 05:36 PM, Bruno Haible wrote: > Hi Ralf, Paul, > > Does this submission format work? (I don't know whether git-merge-changelog > is active when you do "git am".) If not, please use "patch -p1".
'git am -3' on the entire .eml file choked for some reason (git-merge-changelog wasn't able to figure out how to insert the ChangeLog differences without starting from the right commit, but your 2 patches were based on a commit about 'sed -e' that has not been included upstream yet). Probably because it assumed that it will only see one patch per email (given the typical 'git send-email' workflow), but your email had two attachements as two different mime sections within the same email. But 'git am -3' on both 000*.patch files in isolation worked just fine, with less for me to do. Thanks for trying this new format. > Find attached the two proposed patches (the first one unchanged, the second > one > taking into account your remarks). Thanks, pushed. -- Eric Blake [email protected] +1-801-349-2682 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
