Vanaryonstpeter, hi, any possibility to pull XEP-0277? (or may I send it to you through email?)
stpeteroh, I got an error when I followed Kev's instructions
stpeterbut sure, email it to stpeter @ stpeter.im
KevIt's probably easier for Peter to apply it if you send it via email after formatting with `git format-patch`.
Vanaryonstpeter, I found strange it wasn't pulled, that's why I ping you now ;)
Vanaryonokay, will mail it
Kevstpeter: 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.
stpeterthanks for the tip :)
KevYou can also save the email and git am /path/to/mail
stpetersave the mail, or just the attachment?
stpeterI saved the attachment and got this:
$ git am ~/Desktop/xep-0277.xml
Patch format detection failed.
KevIf the mail is sent correctly, the whole mail is what you apply.
KevFeel free to forward to me to check.
stpeternow I get:
$ git am ~/Desktop/xep-0277.eml
Patch is empty. Was it split wrong?
KevForward and I can look :)
stpeterit is pgp-signed, so it's got to be some kind of multipart mime insanity :)
Vanaryonstpeter, do you want me to send it back without any pgp ?
KevVanaryon: Are you generating it correctly with git format-patch, and then sending with git send-email?
VanaryonKev, nope, I sent it from Evolution, my mail client
KevOk, so you send the format-patch output as an attachment to a mail?
VanaryonI try with git format-patch
KevThat will work fine too, it just means Peter has to apply the attachment instead of the whole mail.
KevBut formatting the patch is necessary whichever way.
VanaryonMhh I don't really understand how to proceed, git send-email does not exits
KevThen just use format-patch to create the patch, and send it to Peter as an attachment.
KevIt's the format-patch bit that's the important part.
stpetersorry, I got interrupted here IRL, brb
Vanaryonmhh, git format-patch returns me 0 bytes after stdout
KevAre you sure you're running it correctly?
KevIt should be dumping the patches you ask it to files and then telling you what it did on stdout.
Vanaryonthe problem is that I pushed the commit this morning to my repo.
VanaryonSo there's nothing to patch, according to git
KevSo what command are you running?
Vanaryononly git format-patch, in the root of the repositery
KevI think the manpage tells you you can't do that :p
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
git format-patch HEAD\^
will give you a file that Peter can apply for the topmost commit in your tree.
Kevgit 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)
VanaryonI got it
Vanaryonokay, downloading xsf:master rep.
Vanaryonmhh I can't get it
VanaryonMaybe is it simpler if stpeter update it by pasting the xep-0277.xml file?
KevHow many commits is it?
Kev(That you want him to push)
git format-patch HEAD\~3
should sort it out.
KevAttach those to a mail to Peter.
stpetersighs over standards@ traffic
KevPeter can then save the three attachments, run
git am /path/to/attachments
and all will be well with the world.
Vanaryonstpeter, I mail you the three patch files?
stpetergotta 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.
KevYou're in the middle of a failed git am aren't you?
KevTry something like
git am --abort
KevIt should have given you some warning about this on the previous run, but maybe it decided not to.
stpeterok seems to have worked now
stpeterbut I'm changing 0.2.1 and 0.2.2 to 0.3 :)
stpeterin the spec
stpeterwe don't really use the minor version numbers
KevSo it's a problem with the submitted patch, rather than that Git has screwed up, right?
KevOh, well, want to see a neat trick, then? :)
git rebase -i origin/master
KevThat'll let you rewrite all the history that's occured since the HEAD of origin/master (assuming you've already done a `git fetch`)
KevSo you could squash the three patches together, for example, and not have a record of the interim steps.
KevAnd, indeed, modify the patches while keeping the author etc. intact if you so wish to edit the version numbers but leave the substance intact.
stpeterok, XEP-0277 updated and announced
stpeterno, thank you!
VanaryonWe have added everything we saw from microblogging specs drafts of buddycloud and us :)
Vanaryonthis may be enough for the moment ;)
VanaryonThanks a lot for your help stpeter and Kev, and your work ;)
VanaryonLeave, have a good evening (or afternoon in the US? :) )