Tuesday, April 26, 2011
xsf@muc.xmpp.org
April
Mon Tue Wed Thu Fri Sat Sun
        1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
 
             
XSF Discussion | Logs: http://logs.xmpp.org/xsf/ | Agenda https://trello.com/b/Dn6IQOu0/board-meetings

[01:44:19] *** stpeter has joined the room
[03:26:09] *** stpeter has left the room
[06:34:37] *** Kev shows as "online" and his status message is "http://swift.im/releases/swift-1.0/"
[07:59:58] *** Vanaryon has joined the room
[08:17:23] *** Kooda shows as "online"
[08:30:46] *** petermount has joined the room
[08:30:46] *** petermount shows as "online"
[08:30:46] *** petermount shows as "online"
[08:33:03] *** petermount shows as "online"
[08:38:03] *** petermount shows as "online"
[08:43:03] *** petermount shows as "online"
[08:48:04] *** petermount shows as "online"
[08:53:05] *** petermount shows as "online"
[08:58:06] *** petermount shows as "online"
[09:03:06] *** petermount shows as "online"
[09:08:07] *** petermount shows as "online"
[09:13:08] *** petermount shows as "online"
[09:18:08] *** petermount shows as "online"
[09:23:09] *** petermount shows as "online"
[09:28:09] *** petermount shows as "online"
[09:33:09] *** petermount shows as "online"
[09:38:09] *** petermount shows as "online"
[09:43:10] *** petermount shows as "online"
[09:48:10] *** petermount shows as "online"
[09:53:11] *** petermount shows as "online"
[09:58:11] *** petermount shows as "online"
[10:01:05] *** Kooda shows as "xa" and his status message is "mange"
[10:03:12] *** Kev shows as "away" and his status message is "http://swift.im/releases/swift-1.0/"
[10:03:12] *** petermount shows as "online"
[10:08:13] *** petermount shows as "online"
[10:13:14] *** petermount shows as "online"
[10:17:25] *** Kooda shows as "online"
[10:18:14] *** petermount shows as "online"
[10:23:15] *** petermount shows as "online"
[10:26:59] *** Kooda shows as "xa"
[10:28:16] *** petermount shows as "online"
[10:33:17] *** petermount shows as "online"
[10:38:18] *** petermount shows as "online"
[10:42:07] *** Kev has left the room
[10:42:18] *** Kev has joined the room
[10:42:20] *** Kev shows as "away" and his status message is "http://swift.im/releases/swift-1.0/"
[10:42:32] *** Kev shows as "online" and his status message is "http://swift.im/releases/swift-1.0/"
[10:42:39] *** Tobias has joined the room
[10:43:18] *** petermount shows as "online"
[10:48:19] *** petermount shows as "online"
[10:53:20] *** petermount shows as "online"
[10:58:20] *** petermount shows as "online"
[11:02:54] *** Vanaryon shows as "away" and his status message is "Not here."
[11:03:21] *** petermount shows as "online"
[11:08:22] *** petermount shows as "online"
[11:08:30] *** Kev shows as "away" and his status message is "http://swift.im/releases/swift-1.0/"
[11:08:31] *** Kev shows as "away" and his status message is "http://swift.im/releases/swift-1.0/"
[11:12:23] *** Kev has left the room
[11:13:24] *** petermount shows as "online"
[11:18:24] *** petermount shows as "online"
[11:23:25] *** petermount shows as "online"
[11:28:25] *** petermount shows as "online"
[11:33:26] *** petermount shows as "online"
[11:38:27] *** petermount shows as "online"
[11:43:28] *** petermount shows as "online"
[11:48:29] *** petermount shows as "online"
[11:53:30] *** petermount shows as "online"
[11:55:39] *** Vanaryon shows as "online" and his status message is "« We cannot be sure of having something to live for unless we are willing to die for it. » E. Guevara"
[11:58:31] *** petermount shows as "online"
[12:03:32] *** petermount shows as "online"
[12:06:35] *** Kev shows as "online" and his status message is "http://swift.im/releases/swift-1.0/"
[12:08:32] *** petermount shows as "online"
[12:13:33] *** petermount shows as "online"
[12:18:33] *** petermount shows as "online"
[12:22:53] *** Kooda shows as "online"
[12:23:34] *** petermount shows as "online"
[12:28:35] *** petermount shows as "online"
[12:33:36] *** petermount shows as "online"
[12:38:38] *** petermount shows as "online"
[12:43:39] *** petermount shows as "online"
[12:48:39] *** petermount shows as "online"
[12:53:40] *** petermount shows as "online"
[12:58:41] *** petermount shows as "online"
[13:03:42] *** petermount shows as "online"
[13:08:43] *** petermount shows as "online"
[13:13:43] *** petermount shows as "online"
[13:18:44] *** petermount shows as "online"
[13:22:17] *** Kev shows as "away" and his status message is "http://swift.im/releases/swift-1.0/"
[13:23:45] *** petermount shows as "online"
[13:25:23] *** Kooda shows as "dnd"
[13:28:44] *** petermount shows as "online"
[13:29:46] *** luca tagliaferri has joined the room
[13:30:16] *** luca tagliaferri shows as "dnd" and his status message is "Il fine giustifica i mezzi: ma non quelli pubblici"
[13:31:26] *** Kev shows as "online" and his status message is "http://swift.im/releases/swift-1.0/"
[13:33:45] *** petermount shows as "online"
[13:38:45] *** petermount shows as "online"
[13:43:46] *** petermount shows as "online"
[13:44:49] *** Tobias shows as "online"
[13:44:51] *** Tobias shows as "online"
[13:47:36] *** Tobias has left the room
[13:48:46] *** petermount shows as "online"
[13:53:47] *** petermount shows as "online"
[13:55:45] *** Tobias has left the room
[13:58:49] *** petermount shows as "online"
[14:03:50] *** petermount shows as "online"
[14:08:51] *** petermount shows as "online"
[14:09:06] *** Vanaryon has left the room
[14:13:51] *** petermount shows as "online"
[14:18:51] *** petermount shows as "online"
[14:23:52] *** petermount shows as "online"
[14:28:53] *** petermount shows as "online"
[14:33:55] *** petermount shows as "online"
[14:34:48] *** stpeter has joined the room
[14:38:56] *** petermount shows as "online"
[14:43:57] *** petermount shows as "online"
[14:48:57] *** petermount shows as "online"
[14:50:14] *** stpeter shows as "away" and his status message is "wandered off..."
[14:52:45] *** stpeter shows as "online"
[14:53:57] *** petermount shows as "online"
[14:58:58] *** petermount shows as "online"
[15:03:59] *** petermount shows as "online"
[15:08:59] *** petermount shows as "online"
[15:13:57] *** petermount shows as "online"
[15:15:27] *** Kooda shows as "online"
[15:18:58] *** petermount shows as "online"
[15:23:57] *** petermount shows as "online"
[15:28:59] *** petermount shows as "online"
[15:33:59] *** petermount shows as "online"
[15:39:00] *** petermount shows as "online"
[15:44:01] *** petermount shows as "online"
[15:49:02] *** petermount shows as "online"
[15:54:03] *** petermount shows as "online"
[15:55:14] *** Tobias has joined the room
[15:55:24] *** Tobias shows as "online"
[15:59:04] *** petermount shows as "online"
[16:04:05] *** petermount shows as "online"
[16:09:06] *** petermount shows as "online"
[16:14:07] *** petermount shows as "online"
[16:18:20] *** luca tagliaferri has left the room
[16:19:08] *** petermount shows as "online"
[16:24:09] *** petermount shows as "online"
[16:29:10] *** petermount shows as "online"
[16:34:12] *** petermount shows as "online"
[16:37:51] *** Kooda shows as "dnd" and his status message is "manga"
[16:38:06] *** Tobias shows as "online"
[16:38:08] *** Tobias shows as "online"
[16:39:13] *** petermount shows as "online"
[16:39:40] *** Tobias has left the room
[16:44:14] *** petermount shows as "online"
[16:49:16] *** petermount shows as "online"
[16:50:00] *** Tobias shows as "online"
[16:50:01] *** Tobias shows as "online"
[16:50:46] *** Tobias has left the room
[16:51:12] *** stpeter shows as "away" and his status message is "wandered off..."
[16:51:13] *** stpeter shows as "online"
[16:54:17] *** petermount shows as "online"
[16:57:02] *** Kooda shows as "xa" and his status message is "mange"
[16:59:18] *** petermount shows as "online"
[17:00:21] *** petermount has left the room
[17:07:16] *** Tobias shows as "online"
[17:07:17] *** Tobias shows as "online"
[17:07:56] *** Tobias has left the room
[17:09:58] *** Tobias shows as "online"
[17:09:59] *** Tobias shows as "online"
[17:10:55] *** Tobias has left the room
[17:14:44] *** stpeter shows as "xa" and his status message is "away at lunch"
[17:18:09] *** Tobias shows as "online"
[17:18:10] *** Tobias shows as "online"
[17:18:47] *** Tobias has left the room
[17:19:58] *** Kooda shows as "online"
[17:21:03] *** Tobias shows as "online"
[17:21:05] *** Tobias shows as "online"
[17:21:47] *** Tobias has left the room
[17:23:49] *** Tobias shows as "online"
[17:23:51] *** Tobias shows as "online"
[17:30:34] *** Tobias has left the room
[17:45:31] *** Kooda shows as "dnd"
[17:52:32] *** Tobias shows as "online"
[17:52:34] *** Tobias shows as "online"
[17:53:14] *** Tobias has left the room
[17:56:46] *** Tobias shows as "online"
[17:56:47] *** Tobias shows as "online"
[17:57:41] *** Tobias has left the room
[18:19:03] *** Tobias shows as "online"
[18:19:04] *** Tobias shows as "online"
[18:36:21] *** Kooda shows as "online"
[18:41:04] *** stpeter shows as "online"
[18:48:02] *** Tobias shows as "away" and his status message is "Auto Status (idle)"
[18:54:49] *** Tobias shows as "away"
[19:02:30] *** Tobias shows as "online"
[19:02:31] *** Tobias shows as "online"
[19:05:39] *** Tobias has left the room
[19:09:24] *** luca tagliaferri has joined the room
[19:12:09] *** stpeter shows as "dnd" and his status message is "on the phone"
[19:25:55] *** Tobias shows as "online"
[19:25:57] *** Tobias shows as "online"
[19:26:21] *** Tobias has left the room
[19:32:56] *** stpeter shows as "online"
[19:33:12] *** Tobias shows as "online"
[19:33:14] *** Tobias shows as "online"
[19:34:32] *** Tobias has left the room
[19:42:51] *** MiGri shows as "online" and his status message is "This conversation may be monitored for quality assurance or security purposes. ;)"
[19:48:24] *** Tobias shows as "online"
[19:48:26] *** Tobias shows as "online"
[19:49:04] *** Tobias has left the room
[19:50:07] *** Tobias shows as "online"
[19:50:09] *** Tobias shows as "online"
[19:51:33] *** Tobias has left the room
[19:55:47] *** Vanaryon has joined the room
[19:56:14] *** MiGri shows as "away" and his status message is "I'm not at the computer but I'll read the messages as soon as I'll be back."
[19:59:56] *** Tobias shows as "online"
[19:59:58] *** Tobias shows as "online"
[20:00:23] <Vanaryon> stpeter, hi, any possibility to pull XEP-0277? (or may I send it to you through email?)
[20:00:58] *** Tobias has left the room
[20:01:18] <stpeter> oh, I got an error when I followed Kev's instructions
[20:01:35] <stpeter> but sure, email it to stpeter @ stpeter.im
[20:01:35] <Kev> It's probably easier for Peter to apply it if you send it via email after formatting with `git format-patch`.
[20:01:40] <Vanaryon> stpeter, I found strange it wasn't pulled, that's why I ping you now ;)
[20:01:48] <Vanaryon> okay, will mail it
[20:01:50] <stpeter> k
[20:01:51] <Vanaryon> thanks ;)
[20:02:05] <Kev> 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.
[20:03:10] <stpeter> thanks for the tip :)
[20:03:36] <Vanaryon> done
[20:03:45] <Kev> You can also save the email and git am /path/to/mail
[20:05:24] <stpeter> save the mail, or just the attachment?
[20:05:34] <stpeter> I saved the attachment and got this:

$ git am ~/Desktop/xep-0277.xml
Patch format detection failed.

[20:05:54] <Kev> If the mail is sent correctly, the whole mail is what you apply.
[20:05:59] <stpeter> ah ok
[20:06:08] *** Tobias shows as "online"
[20:06:10] *** Tobias shows as "online"
[20:06:13] <Kev> Feel free to forward to me to check.
[20:06:37] <stpeter> now I get:

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

[20:06:38] <stpeter> :)
[20:07:10] <Kev> Forward and I can look :)
[20:07:36] <stpeter> ok
[20:07:52] <stpeter> it is pgp-signed, so it's got to be some kind of multipart mime insanity :)
[20:08:20] <Vanaryon> stpeter, do you want me to send it back without any pgp ?
[20:08:39] <Kev> Vanaryon: Are you generating it correctly with git format-patch, and then sending with git send-email?
[20:08:57] <Vanaryon> Kev, nope, I sent it from Evolution, my mail client
[20:09:18] <Kev> Ok, so you send the format-patch output as an attachment to a mail?
[20:09:19] <Vanaryon> I try with git format-patch
[20:09:25] <Vanaryon> nope
[20:09:55] <Kev> That will work fine too, it just means Peter has to apply the attachment instead of the whole mail.
[20:10:04] <Kev> But formatting the patch is necessary whichever way.
[20:10:55] <Vanaryon> Mhh I don't really understand how to proceed, git send-email does not exits
[20:10:57] <Vanaryon> *-s
[20:11:40] <Kev> Then just use format-patch to create the patch, and send it to Peter as an attachment.
[20:11:46] <Kev> It's the format-patch bit that's the important part.
[20:12:32] <stpeter> sorry, I got interrupted here IRL, brb
[20:13:32] <Vanaryon> mhh, git format-patch returns me 0 bytes after stdout
[20:15:30] *** Tobias has left the room
[20:15:33] <Kev> Are you sure you're running it correctly?
[20:16:03] <Kev> It should be dumping the patches you ask it to files and then telling you what it did on stdout.
[20:16:04] <Vanaryon> the problem is that I pushed the commit this morning to my repo.
[20:16:25] <Vanaryon> So there's nothing to patch, according to git
[20:16:38] <Kev> So what command are you running?
[20:17:50] <Vanaryon> only git format-patch, in the root of the repositery
[20:18:27] <Kev> I think the manpage tells you you can't do that :p
[20:18:38] <Kev> 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.
[20:19:07] <Kev> So
git format-patch HEAD\^
will give you a file that Peter can apply for the topmost commit in your tree.
[20:19:30] <Kev> 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)
[20:20:42] <Vanaryon> I got it
[20:26:21] <Vanaryon> okay, downloading xsf:master rep.
[20:27:52] *** Kooda shows as "xa" and his status message is "douche"
[20:29:07] *** MiGri shows as "online" and his status message is "This conversation may be monitored for quality assurance or security purposes. ;)"
[20:30:50] <Vanaryon> mhh I can't get it
[20:31:16] <Vanaryon> Maybe is it simpler if stpeter update it by pasting the xep-0277.xml file?
[20:31:59] <Kev> How many commits is it?
[20:32:06] <Kev> (That you want him to push)
[20:32:17] <Vanaryon> 3
[20:32:28] <Kev> Then
git format-patch HEAD\~3
should sort it out.
[20:33:04] <Vanaryon> done :)
[20:33:23] <Kev> Attach those to a mail to Peter.
[20:33:39] *stpeter sighs over standards@ traffic
[20:33:42] <Kev> Peter can then save the three attachments, run
git am /path/to/attachments
and all will be well with the world.
[20:36:19] <Vanaryon> stpeter, I mail you the three patch files?
[20:40:27] <stpeter> yes please
[20:41:09] <Vanaryon> done
[20:41:19] <stpeter> received
[20:42:46] *** MiGri shows as "away" and his status message is "I'm not at the computer but I'll read the messages as soon as I'll be back."
[20:43:22] *** Vanaryon shows as "online" and his status message is "« We cannot be sure of having something to live for unless we are willing to die for it. » E. Guevara"
[20:44:53] <stpeter> 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.

[20:45:02] <Kev> Sorry.
[20:45:06] *** Vanaryon shows as "online" and his status message is "« We cannot be sure of having something to live for unless we are willing to die for it. » E. Guevara"
[20:45:13] <Kev> You're in the middle of a failed git am aren't you?
[20:45:14] *** Vanaryon shows as "online" and his status message is "« We cannot be sure of having something to live for unless we are willing to die for it. » E. Guevara"
[20:45:18] <Kev> Try something like
git am --abort
[20:45:19] <stpeter> perchance
[20:45:34] <Kev> It should have given you some warning about this on the previous run, but maybe it decided not to.
[20:46:17] <stpeter> ok seems to have worked now
[20:46:19] *stpeter checks
[20:46:40] <stpeter> but I'm changing 0.2.1 and 0.2.2 to 0.3 :)
[20:46:58] <Kev> Hmm?
[20:47:05] <stpeter> in the spec
[20:47:18] <stpeter> we don't really use the minor version numbers
[20:47:54] <Kev> So it's a problem with the submitted patch, rather than that Git has screwed up, right?
[20:47:57] <stpeter> right
[20:47:58] <stpeter> sorry
[20:48:01] <stpeter> wasn't clear
[20:51:38] <Kev> Oh, well, want to see a neat trick, then? :)
[20:51:45] *** Vanaryon shows as "online" and his status message is "« We cannot be sure of having something to live for unless we are willing to die for it. » E. Guevara"
[20:52:02] <stpeter> I do!
[20:52:04] *** Vanaryon shows as "online" and his status message is "« We cannot be sure of having something to live for unless we are willing to die for it. » E. Guevara"
[20:52:06] <Kev> You can
git rebase -i origin/master
[20:52:24] <Kev> 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`)
[20:52:44] <Kev> So you could squash the three patches together, for example, and not have a record of the interim steps.
[20:53:44] <Kev> 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.
[20:54:44] *** Kooda shows as "online"
[20:55:12] <stpeter> ok, XEP-0277 updated and announced
[20:55:57] <Vanaryon> thanks :)
[20:56:34] <stpeter> no, thank you!
[20:56:42] <Vanaryon> We have added everything we saw from microblogging specs drafts of buddycloud and us :)
[20:57:52] <Vanaryon> this may be enough for the moment ;)
[20:58:15] <Vanaryon> Thanks a lot for your help stpeter and Kev, and your work ;)
[20:58:41] <Vanaryon> Leave, have a good evening (or afternoon in the US? :) )
[20:59:04] *** Vanaryon has left the room
[20:59:15] *** Tobias shows as "online"
[20:59:17] *** Tobias shows as "online"
[21:02:33] *** Tobias has left the room
[21:17:17] *** Tobias shows as "online"
[21:17:19] *** Tobias shows as "online"
[21:17:45] *** Tobias has left the room
[21:20:51] *** MiGri shows as "online" and his status message is "This conversation may be monitored for quality assurance or security purposes. ;)"
[21:20:51] *** MiGri shows as "xa" and his status message is "Screen detached. I'll read the messages as soon as I'll be back."
[21:23:39] *** Tobias shows as "online"
[21:23:41] *** Tobias shows as "online"
[21:24:24] *** Tobias has left the room
[21:26:12] *** stpeter has left the room
[21:30:21] *** Kev shows as "away" and his status message is "http://swift.im/releases/swift-1.0/"
[21:44:47] *** Kooda shows as "dnd" and his status message is "manga"
[21:51:08] *** davidczech has joined the room
[22:08:05] *** Kooda shows as "online"
[22:11:54] *** Tobias shows as "away" and his status message is "Auto Status (idle)"
[22:19:33] *** Tobias shows as "online"
[22:19:56] *** davidczech has left the room
[22:24:09] *** Neustradamus shows as "away"
[22:42:33] *** Tobias shows as "away" and his status message is "Auto Status (idle)"
[22:48:20] *** Tobias shows as "online"
[23:16:35] *** bear has left the room
[23:31:03] *** Kooda shows as "xa" and his status message is "détaché"