XSF Discussion - 2011-04-26

stpeter, hi, any possibility to pull XEP-0277? (or may I send it to you through email?)

oh, I got an error when I followed Kev's instructions

but sure, email it to stpeter @ stpeter.im

It's probably easier for Peter to apply it if you send it via email after formatting with `git format-patch`.

stpeter, I found strange it wasn't pulled, that's why I ping you now ;)

okay, will mail it

k

thanks ;)

stpeter: To apply a mailed patch, easiest is just to view source, select all, copy, and in a terminal run `pbpaste | git am` and the patch will be ready applied.

thanks for the tip :)

done

You can also save the email and git am /path/to/mail

save the mail, or just the attachment?

I saved the attachment and got this: $ git am ~/Desktop/xep-0277.xml Patch format detection failed.

If the mail is sent correctly, the whole mail is what you apply.

ah ok

Feel free to forward to me to check.

now I get: $ git am ~/Desktop/xep-0277.eml Patch is empty. Was it split wrong?

:)

Forward and I can look :)

ok

it is pgp-signed, so it's got to be some kind of multipart mime insanity :)

stpeter, do you want me to send it back without any pgp ?

Vanaryon: Are you generating it correctly with git format-patch, and then sending with git send-email?

Kev, nope, I sent it from Evolution, my mail client

Ok, so you send the format-patch output as an attachment to a mail?

I try with git format-patch

nope

That will work fine too, it just means Peter has to apply the attachment instead of the whole mail.

But formatting the patch is necessary whichever way.

Mhh I don't really understand how to proceed, git send-email does not exits

*-s

Then just use format-patch to create the patch, and send it to Peter as an attachment.

It's the format-patch bit that's the important part.

sorry, I got interrupted here IRL, brb

mhh, git format-patch returns me 0 bytes after stdout

Are you sure you're running it correctly?

It should be dumping the patches you ask it to files and then telling you what it did on stdout.

the problem is that I pushed the commit this morning to my repo.

So there's nothing to patch, according to git

So what command are you running?

only git format-patch, in the root of the repositery

I think the manpage tells you you can't do that :p

DESCRIPTION Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. The output of this command is convenient for e-mail submission or for use with git am. There are two ways to specify which commits to operate on. 1. A single commit, <since>, specifies that the commits leading to the tip of the current branch that are not in the history that leads to the <since> to be output. 2. Generic <revision range> expression (see "SPECIFYING REVISIONS" section in gitrevisions(7)) means the commits in the specified range.

So git format-patch HEAD\^ will give you a file that Peter can apply for the topmost commit in your tree.

git format-patch xsf/master will give you patches for every commit in your tree that isn't in the 'master' branch on the 'xsf' remote (if you've set one up)

I got it

okay, downloading xsf:master rep.

mhh I can't get it

Maybe is it simpler if stpeter update it by pasting the xep-0277.xml file?

How many commits is it?

(That you want him to push)

3

Then git format-patch HEAD\~3 should sort it out.

done :)

Attach those to a mail to Peter.

Peter can then save the three attachments, run git am /path/to/attachments and all will be well with the world.

stpeter, I mail you the three patch files?

yes please

done

received

gotta love git error messages: $ git am ~/Documents/tmp/patches/ previous rebase directory /Users/stpeter/Documents/git/xmpp/.git/rebase-apply still exists but mbox given.

Sorry.

You're in the middle of a failed git am aren't you?

Try something like git am --abort

perchance

It should have given you some warning about this on the previous run, but maybe it decided not to.

ok seems to have worked now

but I'm changing 0.2.1 and 0.2.2 to 0.3 :)

Hmm?

in the spec

we don't really use the minor version numbers

So it's a problem with the submitted patch, rather than that Git has screwed up, right?

right

sorry

wasn't clear

Oh, well, want to see a neat trick, then? :)

I do!

You can git rebase -i origin/master

That'll let you rewrite all the history that's occured since the HEAD of origin/master (assuming you've already done a `git fetch`)

So you could squash the three patches together, for example, and not have a record of the interim steps.

And, indeed, modify the patches while keeping the author etc. intact if you so wish to edit the version numbers but leave the substance intact.

ok, XEP-0277 updated and announced

thanks :)

no, thank you!

We have added everything we saw from microblogging specs drafts of buddycloud and us :)

this may be enough for the moment ;)

Thanks a lot for your help stpeter and Kev, and your work ;)

Leave, have a good evening (or afternoon in the US? :) )