[00:07:51] --- dev-zero@jabber.org has become available [00:31:51] --- Russ has left: Disconnected [00:36:53] --- Claudio Bisegni has become available [00:39:50] --- Claudio Bisegni has left [00:40:52] --- Claudio Bisegni has become available [00:41:37] --- Claudio Bisegni has left [00:41:37] --- Claudio Bisegni has become available [00:42:15] --- Claudio Bisegni has left [00:42:15] --- Claudio Bisegni has become available [00:43:01] --- Claudio Bisegni has left [00:43:24] --- Claudio Bisegni has become available [00:47:24] --- Claudio Bisegni has left [00:47:25] --- Claudio Bisegni has become available [00:48:48] --- Claudio Bisegni has left [00:48:49] --- Claudio Bisegni has become available [00:48:56] --- Claudio Bisegni has left [00:51:27] --- Claudio Bisegni has become available [00:51:36] --- Claudio Bisegni has left [00:53:26] --- Claudio Bisegni has become available [00:53:41] --- Claudio Bisegni has left [00:53:41] --- Claudio Bisegni has become available [00:53:53] --- Claudio Bisegni has left [00:54:05] --- Claudio Bisegni has become available [00:54:59] --- Claudio Bisegni has left [00:56:23] --- Claudio Bisegni has become available [01:11:20] --- haba has left [01:20:21] --- sxw mobile has become available [02:09:24] --- sxw mobile has left [03:15:27] --- haba has become available [05:03:03] @derrick, i must push again on change set 263? [05:03:34] ok [05:03:53] if you must, you must [05:05:04] well, he wanted to know if he should push to the same changeset, i assume. "yes" [05:05:13] but now i am going to go bike for a bit. i need the exercise [05:28:41] yes i wanted to know if was the same changeset [05:28:43] @derrick ok:-) good biking [05:34:48] --- Jeffrey Altman has left: Replaced by new connection [06:24:41] --- matt has become available [06:32:47] --- matt has left [06:34:20] indeed, it was good biking [06:50:19] --- deason has become available [06:53:13] --- reuteras has left [07:12:36] @derrick, i have seen another merge problem, but in my local branch the rebase has gone well [07:13:57] the problem is i am not on your local branch [07:14:58] and what i can do now? [07:15:35] can you rebase from a current origin/master, just that change, and see what happens? [07:18:50] how can do this from my branch? [07:19:10] i... have no idea. [07:19:27] worst case: format-patch, patch onto master, commit, push that? [07:19:34] but that seems like a cop-out [07:19:55] there should be a right way. it's not clear to me what it is [07:20:24] i'll send an email with git log in the two my branch [07:29:28] just a 'git rebase origin/master' doesn't do what you want? [07:31:00] yes [07:31:17] but it give me current branch is up to date [07:31:26] but it's not resolve the problem [07:31:51] no w make a new branch form master and complete the work on this new branch [08:01:50] --- agoode has become available [08:08:29] --- Claudio Bisegni has left [08:10:31] --- matt has become available [09:08:42] apparently the "will retry" on VL RegisterAddrs failure doesn't so much retry at least in some cases [09:13:36] fix pushed [09:13:42] oh, crap [09:14:38] --- Claudio Bisegni has become available [09:14:57] --- Claudio Bisegni has left [09:19:32] --- Claudio Bisegni has become available [09:19:54] fix pushed again [09:24:32] hi, i'm here again i must push the old branch, or the new one that i have mentioned into the mail? [09:25:29] i assume you want to push the new branch [09:25:46] git log -p origin..HEAD shows what? [09:27:29] commit 1d6f41ef7dfcbd014f4df5264a881de4b2d6ad3d whti all the change [09:27:54] that came after commit 7868e1961048d2a24bd5d4d5afab07d3dbf54fd2 [09:30:39] well, you can try pushing it to 263 and we'll see what happens [09:30:57] ok i'll push now [09:31:37] --- haba has left [09:33:39] done [09:34:57] Wait. [09:35:10] When is the AFS conference this fall? Is there a web page? [09:35:55] SUMMON edgester [09:36:58] september 28th or somesuch in rome. [09:37:28] Yeah; I was hoping for more precision than "or somesuch" [09:38:01] i am not your google [09:42:56] 28-30 september [09:43:15] which is 28th september or thereabouts :) [09:43:39] Yeah, thanks. [09:44:00] I wonder if I can go. It would be a perfect time to announce the results of the afs3-std election. [09:44:10] this is the site http://www.dia.uniroma3.it/~afscon09/ [09:44:23] ok, this time the rebased change worked [09:44:35] ok perfect [09:45:27] (BTW, expect to see movement on the charter/election process today) [10:12:40] --- dev-zero@jabber.org has left [10:47:40] --- dev-zero@jabber.org has become available [11:27:18] --- Russ has become available [11:34:15] --- Claudio Bisegni has left [11:56:31] BTW, not a big deal, but going forward can we resubmit patches that have >80 character lines in the commit comments to wrap them before merging them? [12:01:10] I was wondering about what char limit is the norm for these; 80 itself? or 72, or something else? [12:07:07] * Russ uses 74 just because I use 74 as a wrap margin for all text files. [12:07:36] Since the Git commit messages indent by about four spaces, as do many of the git log options, 76 or less is a good idea. [15:27:27] --- bpoliakoff has become available [15:28:43] --- bpoliakoff has left [16:24:29] --- matt has left [16:26:00] --- Simon Wilkinson has become available [16:29:39] --- cclausen has become available [17:29:50] --- matt has become available [17:41:02] --- matt has left [18:05:04] --- Simon Wilkinson has left [18:41:47] --- deason has left [18:41:57] --- deason has become available [18:59:19] --- Russ has left: Disconnected [19:17:01] --- Russ has become available [19:17:50] --- matt has become available [20:26:08] --- shadow@gmail.com/owl34D4DBE0 has left [20:50:50] --- shadow@gmail.com/owl1A054DC7 has become available [20:52:30] --- deason has left [21:21:49] --- matt has left [21:52:33] --- cclausen has left [22:44:50] --- reuteras has become available [23:08:33] --- dev-zero@jabber.org has left: Replaced by new connection [23:08:34] --- dev-zero@jabber.org has become available