[00:05:27] --- jaltman/FrogsLeap has left: Disconnected [00:07:14] --- jaltman/FrogsLeap has become available [00:14:02] updated 1.6.0b installers copied to 1.6.0 volume on grand. please release whenever [00:14:02] --- mfelliott has left: Lost connection [00:14:02] --- shadow@gmail.com/barnowl67590625 has left: Lost connection [00:14:15] --- shadow@gmail.com/barnowl67590625 has become available [00:40:10] --- phalenor has left [00:40:17] --- phalenor has become available [05:45:47] --- jaltman/FrogsLeap has left: Replaced by new connection [05:45:48] --- jaltman/FrogsLeap has become available [06:23:33] --- jaltman/FrogsLeap has left: Disconnected [06:27:27] --- jaltman/FrogsLeap has become available [06:29:34] --- jaltman/FrogsLeap has left: Disconnected [06:31:38] --- jaltman/FrogsLeap has become available [07:01:39] --- steven.jenkins has left [07:02:35] --- Simon Wilkinson has become available [07:29:06] --- Simon Wilkinson has left [07:30:53] --- deason/gmail has become available [07:48:39] --- Russ has left: Disconnected [08:26:34] --- jakllsch has become available [08:26:34] --- jakllsch has left: Lost connection [08:27:54] --- jakllsch has become available [08:27:54] --- jakllsch has left: Lost connection [08:31:51] --- jakllsch has become available [08:31:51] --- jakllsch has left: Lost connection [08:32:16] --- jakllsch has become available [08:32:16] --- jakllsch has left: Lost connection [08:37:17] --- jakllsch has become available [08:37:18] --- jakllsch has left: Lost connection [08:37:24] --- jakllsch has become available [08:40:18] (so, apparently my @gmail.com jabber account doesn't like connecting here) [08:41:23] obviously mine is fine... [08:44:24] anyhow, NetBSD support in 1.6, how should i go about doing that? submit patches against openafs-stable-1_6_x ? cherry pick from master? [08:45:17] cherry pick from master where things are available. for things which apply to only 1.6, patch directly [08:45:58] in places where it matters, should whitespace be kept consistent with the 1.6 version? [08:59:39] --- jakllsch has left [08:59:43] --- jakllsch has become available [08:59:56] feh, ^w does not do what i expect [09:05:53] hmm, cherry picking from master ... do i need a new change id when i do that? [09:06:27] if the cherry-pick works, it works. if not, keep the 1.6 whitespace conventions [09:07:06] actually, i did the whitespace change just before the other change, i may cherry pick both [09:07:34] and yes, you need a new commit id for each cherry-pick; i use cherry-pick -e -x and then commit --amend [09:25:36] what if a cherry pick has conflicts? commit as if it's a new change? [09:25:52] fix the conflicts and keep it as a cherry-pick, if possible [09:35:31] i wonder if i removed enough from the cherry pick commit messages ... oh well, it'll be easy enough to re-do if not [09:42:55] all you need to remove is commit-id. you need to re-add the cherry picked from commit [11:19:59] --- Simon Wilkinson has become available [11:41:39] --- Simon Wilkinson has left [12:34:57] --- deason/gmail has left [12:35:16] --- jakllsch has left [12:35:41] --- deason-gmail has become available [12:51:48] --- jakllsch has become available [12:55:16] --- jakllsch has left [12:56:11] --- jakllsch has become available [12:57:24] --- shadow@gmail.com/barnowl67590625 has left [12:57:31] --- shadow@gmail.com/barnowl67590625 has become available [12:59:46] --- jakllsch has left [13:02:03] --- jakllsch has become available [13:11:16] --- jakllsch has left [13:11:58] --- jakllsch has become available [13:15:16] --- jakllsch has left [13:15:40] --- jakllsch has become available [13:21:46] --- jakllsch has left [13:27:30] --- jakllsch has become available [13:36:46] --- jakllsch has left [13:37:01] --- jakllsch has become available [13:48:42] --- mfelliott95912 has left [13:49:46] --- jakllsch has left [13:50:17] --- jakllsch has become available [14:27:13] --- mfelliott has become available [14:37:36] --- haba has left [14:42:46] --- shadow@gmail.com/barnowl67590625 has left [14:42:56] --- shadow@gmail.com/barnowl67590625 has become available [15:12:57] --- Russ has become available [15:36:22] --- deason-gmail has left [15:44:36] --- Simon Wilkinson has become available [16:06:47] --- jaltman/FrogsLeap has left: Disconnected [16:08:59] --- jaltman/FrogsLeap has become available [16:40:39] --- phalenor has left [16:40:40] --- phalenor has become available [16:51:42] --- Russ has left: Disconnected [18:22:23] --- Simon Wilkinson has left [20:36:07] --- Russ has become available [21:02:49] --- lars.malinowsky has left [21:02:56] --- lars.malinowsky has become available [21:13:44] --- Russ has left: Disconnected [21:16:32] --- Russ has become available [21:47:22] --- jakllsch has left [21:48:05] --- jakllsch has become available [22:21:32] --- reuteras has left [22:46:20] --- reuteras has become available [23:49:49] --- haba has become available