[00:02:22] remo is now away
[00:14:57] ambush is now offline
[00:15:46] gigimon is now online
[00:20:38] λ is now offline
[00:20:44] λ is now online
[00:45:39] madmercen is now online
[00:47:03] λ is now offline
[00:51:23] remo: fuzzy: интересно, а с какого такого thread грузит 100% cpu ? http://bpaste.net/show/141765/
[00:52:26] fuzzy: while 1:
pass
[00:59:37] огыешсук is now offline
[01:01:13] огыешсук is now online
[01:15:07] AlexZenon is now xa
[01:16:03] madmercen is now away
[01:26:03] madmercen is now xa
[01:36:00] remo is now offline
[01:36:32] remo is now away
[01:47:51] Сволота is now away
[01:52:07] огыешсук is now offline
[01:57:51] Сволота is now xa
[01:59:21] remo: парни, а есть что-то по-лучше, нежели psutil ?
[02:08:53] opka is now offline
[02:10:30] remo is now offline
[02:22:59] огыешсук is now online
[02:32:06] fuzzy: чем?
[02:40:54] gigimon is now online
[02:44:14] огыешсук is now offline
[02:45:54] gigimon is now away
[02:57:27] remo is now online
[03:27:35] Сволота is now xa
[03:27:35] gigimon is now away
[03:27:35] blw0rm is now dnd
[03:27:35] best is now xa
[03:27:35] fuzzy is now online
[03:27:35] bliznezz is now away
[03:27:35] Tony is now online
[03:27:35] AlexZenon is now xa
[03:27:35] madmercen is now xa
[03:27:35] ds.tihonov is now дома! :)
[03:27:35] syshnak is now online
[03:27:35] remo is now online
[03:27:35] magic_pony is now online
[03:27:35] : slav0nic установил(а) тему: python.su | Сначала поищи ответ на docs.python.org | Теперь поищи в google.com | Код постить в dumpz.org | Хочешь задать вопрос - просто *задай* его! | Правила написания хорошего кода: http://➡.ws/pep8 | Логи: http://logs.python.su
[03:39:05] madmercen is now online
[03:49:15] madmercen is now away
[03:50:17] madmercen is now online
[03:51:58] fuzzy is now online
[03:53:49] gigimon is now away
[03:53:51] gigimon is now online
[03:56:58] fuzzy is now away
[03:59:45] gigimon is now offline
[04:10:35] madmercen is now away
[04:19:23] madmercen is now online
[04:20:46] remo is now offline
[04:25:00] Tony is now away
[04:28:02] огыешсук is now online
[04:28:50] огыешсук is now offline
[04:29:36] Tony is now online
[04:53:05] madmercen is now away
[04:59:38] Tony is now away
[05:03:05] madmercen is now xa
[05:24:38] Tony is now xa
[05:31:43] madmercen is now online
[05:54:17] madmercen is now away
[06:01:45] madmercen is now online
[06:07:01] madmercen is now away
[06:14:23] madmercen is now online
[06:28:42] огыешсук is now online
[06:45:29] огыешсук is now offline
[06:51:17] madmercen is now away
[06:57:29] madmercen is now online
[07:03:19] Сволота is now online
[07:13:11] emese is now online
[07:43:18] Сволота is now online
[07:43:18] emese is now online
[07:43:18] blw0rm is now dnd
[07:43:18] best is now xa
[07:43:18] fuzzy is now away
[07:43:18] bliznezz is now away
[07:43:18] Tony is now xa
[07:43:18] AlexZenon is now xa
[07:43:18] madmercen is now online
[07:43:18] ds.tihonov is now дома! :)
[07:43:18] syshnak is now online
[07:43:18] magic_pony is now online
[07:43:18] : slav0nic установил(а) тему: python.su | Сначала поищи ответ на docs.python.org | Теперь поищи в google.com | Код постить в dumpz.org | Хочешь задать вопрос - просто *задай* его! | Правила написания хорошего кода: http://➡.ws/pep8 | Логи: http://logs.python.su
[08:13:29] Сволота is now online
[08:13:29] emese is now online
[08:13:29] blw0rm is now dnd
[08:13:29] best is now xa
[08:13:29] fuzzy is now away
[08:13:29] bliznezz is now away
[08:13:29] Tony is now xa
[08:13:29] AlexZenon is now xa
[08:13:29] madmercen is now online
[08:13:29] ds.tihonov is now дома! :)
[08:13:29] syshnak is now online
[08:13:29] magic_pony is now online
[08:13:29] : slav0nic установил(а) тему: python.su | Сначала поищи ответ на docs.python.org | Теперь поищи в google.com | Код постить в dumpz.org | Хочешь задать вопрос - просто *задай* его! | Правила написания хорошего кода: http://➡.ws/pep8 | Логи: http://logs.python.su
[08:23:25] Сволота is now away
[08:23:39] Сволота is now online
[08:41:55] Сволота is now away
[08:44:02] fuzzy is now away
[08:51:55] Сволота is now xa
[09:09:50] λ is now online
[09:17:11] madmercen is now away
[09:21:07] madmercen is now online
[09:21:36] λ is now offline
[09:21:52] λ is now online
[09:24:47] dicos is now online
[09:28:49] madmercen is now away
[09:29:43] огыешсук is now online
[09:29:57] огыешсук is now offline
[09:32:03] dicos is now away
[09:32:05] dicos is now away
[09:32:33] dicos is now away
[09:32:35] dicos is now online
[09:38:49] madmercen is now xa
[09:38:57] madmercen is now online
[09:52:01] Сволота is now online
[09:58:30] λ is now online
[09:59:49] madmercen is now away
[10:01:19] emese is now offline
[10:09:49] madmercen is now xa
[10:09:51] madmercen is now online
[10:12:59] Сволота is now away
[10:22:07] λ is now away
[10:22:07] λ is now away
[10:22:59] Сволота is now xa
[10:23:39] Сволота is now online
[10:25:59] dicos is now away
[10:26:01] dicos is now away
[10:26:23] dicos is now away
[10:26:25] dicos is now online
[10:31:39] madmercen is now away
[10:32:55] λ is now away
[10:32:55] λ is now online
[10:35:43] ambush is now online
[10:37:56] λ is now away
[10:37:56] λ is now away
[10:38:11] blw0rm is now offline
[10:40:23] ambush is now away
[10:40:41] dicos is now away
[10:40:43] dicos is now away
[10:41:17] λ is now away
[10:41:17] λ is now online
[10:41:39] madmercen is now xa
[10:41:47] dicos is now away
[10:41:49] dicos is now online
[10:46:20] blw0rm is now dnd
[10:46:55] emese is now online
[10:47:44] dicos is now away
[10:47:46] dicos is now away
[10:48:08] ambush is now online
[10:53:26] ambush is now offline
[10:53:41] ambush is now online
[10:53:54] opka is now online
[10:55:41] madmercen is now online
[10:56:26] λ is now offline
[10:58:37] λ is now away
[11:02:39] λ is now away
[11:02:39] λ is now online
[11:02:53] dicos is now away
[11:02:55] dicos is now online
[11:08:10] λ is now away
[11:08:10] λ is now away
[11:14:01] madmercen is now away
[11:22:11] λ is now online
[11:24:01] madmercen is now xa
[11:28:58] ambush is now away
[11:29:05] Сволота is now away
[11:37:07] Сволота is now online
[11:38:16] levsha is now online
[11:38:38] levsha is now offline
[11:38:59] ambush is now xa
[11:42:42] λ is now online
[11:45:09] Сволота is now away
[11:51:58] ambush is now online
[11:52:51] λ is now offline
[11:52:57] λ is now online
[11:55:09] Сволота is now xa
[12:03:19] λ is now offline
[12:03:19] λ is now online
[12:08:20] λ is now offline
[12:08:48] ambush is now offline
[12:08:49] λ is now online
[12:09:30] ambush is now online
[12:10:09] λ is now away
[12:10:59] ambush is now offline
[12:11:08] λ is now away
[12:11:08] λ is now online
[12:11:32] ambush is now online
[12:23:33] ambush is now away
[12:23:38] ambush is now online
[12:26:27] ambush is now offline
[12:27:08] ambush is now online
[12:28:29] ambush is now offline
[12:29:24] ambush is now online
[12:31:56] fuzzy is now away
[12:32:02] fuzzy is now online
[12:33:52] λ is now offline
[12:33:57] λ is now online
[12:36:14] remo is now online
[12:37:57] madmercen is now online
[12:44:03] opka is now offline
[12:44:06] ambush is now away
[12:46:25] gigimon is now online
[12:47:19] dicos is now offline
[12:50:10] Tony is now online
[12:52:46] gigimon: fuzzy: ты тут стал уже 100% отвечальщиком и универсальным гуглом на любой вопрос)
[12:52:56] fuzzy: :(
[12:54:07] ambush is now xa
[12:54:27] λ is now offline
[12:56:43] Сволота is now online
[13:01:54] ambush is now online
[13:04:30] ambush is now offline
[13:05:10] ambush is now online
[13:09:16] ambush is now offline
[13:10:24] ambush is now online
[13:13:44] ambush is now away
[13:14:34] ambush is now online
[13:14:59] ambush is now offline
[13:15:02] gigimon is now online
[13:15:04] ambush is now online
[13:20:02] gigimon is now away
[13:24:11] gigimon is now away
[13:27:37] madmercen is now away
[13:29:48] gigimon is now away
[13:29:50] gigimon is now online
[13:30:01] Сволота is now away
[13:35:11] ambush is now offline
[13:36:35] Сволота is now online
[13:37:37] madmercen is now xa
[13:53:27] Сволота is now away
[14:03:27] Сволота is now xa
[14:07:15] gigimon is now online
[14:12:15] gigimon is now away
[14:12:22] gigimon is now away
[14:12:23] gigimon is now online
[14:14:30] AlexZenon is now online
[14:15:14] ambush is now online
[14:17:24] ambush is now offline
[14:18:10] ambush is now online
[14:21:32] ambush is now away
[14:24:48] ambush is now online
[14:27:07] огыешсук is now online
[14:30:57] ambush is now offline
[14:36:07] gigimon is now online
[14:37:21] madmercen is now online
[14:41:04] огыешсук is now away
[14:41:05] огыешсук is now online
[14:41:07] gigimon is now away
[14:42:25] madmercen is now away
[14:45:07] madmercen is now online
[14:51:03] madmercen is now away
[14:56:56] λ is now online
[15:00:06] evch26 is now online
[15:00:33] madmercen is now online
[15:03:57] λ is now offline
[15:04:20] λ is now online
[15:12:47] madmercen is now away
[15:16:41] madmercen is now online
[15:18:21] gigimon is now away
[15:18:21] gigimon is now online
[15:18:57] evch26 is now offline
[15:24:01] gigimon is now offline
[15:25:00] madmercen is now away
[15:26:59] madmercen is now online
[15:32:58] огыешсук is now away
[15:33:00] огыешсук is now online
[15:33:01] огыешсук is now online
[15:34:42] remo: Может он и есть гугл. Новая разработка гугла: всезнайка)
[15:35:03] remo: Кодовое название fuzzy
[15:37:17] ds.tihonov is now offline
[15:42:14] remo: fuzzy: как ты попал на этот канал? Расскажи свою историю.
[15:42:16] emese is now online
[15:42:25] fuzzy: я знаят
[15:43:22] madmercen is now away
[15:53:22] madmercen is now xa
[16:06:59] ds.tihonov is now дома! :)
[16:07:59] AlexZenon is now offline
[16:08:00] AlexZenon is now online
[16:18:29] λ is now online
[16:30:51] emese is now away
[16:30:52] emese is now away
[16:31:05] λ is now online
[16:34:43] emese is now away
[16:34:44] emese is now online
[16:34:51] λ: гитхаб лежит
[16:34:51] λ is now online
[16:39:11] Tony is now away
[16:51:58] emese is now offline
[17:04:11] Tony is now xa
[17:32:05] gigimon is now online
[17:39:04] obivan is now online
[17:42:48] obivan: парни
[17:42:50] obivan: хелп
[17:42:58] obivan: пытаюсь создать базу данных в flask
[17:43:11] obivan: http://pastebin.com/YfeFg9Km
[17:43:14] obivan: трейсбек
[17:43:30] obivan: файлик с помощью которого создаю бд
[17:43:33] obivan: http://pastebin.com/PPy8uGEg
[17:43:36] obivan: база sqlite
[17:48:16] fuzzy: вот это migrate\versioning похоже поломано
[17:53:46] obivan: ладно
[17:53:48] obivan: выкинул его
[17:57:12] огыешсук is now away
[17:59:37] Tony is now online
[18:05:00] огыешсук is now online
[18:07:29] madmercen is now online
[18:08:23] Сволота is now online
[18:11:57] λ is now offline
[18:12:09] λ is now online
[18:14:57] madmercen is now away
[18:19:03] madmercen is now online
[18:21:00] λ: я тупой
[18:21:27] λ: можно делать curl -v без просмотра body ?
[18:24:05] madmercen is now away
[18:24:15] λ: curl -I
[18:25:27] λ: хотя он как-то мало инфы тащит...
[18:26:47] madmercen is now online
[18:32:01] Сволота is now away
[18:40:33] andreyjkee is now online
[18:42:01] Сволота is now xa
[18:45:01] madmercen is now away
[18:45:13] madmercen is now online
[18:45:32] gigimon is now online
[18:47:34] λ is now offline
[18:47:38] λ is now online
[18:49:24] andreyjkee is now offline
[18:49:24] andreyjkee is now online
[18:50:14] λ: учусь использовать hg. Есть у меня пару коммитов на локалхосте и на сервер пару штука уже залили. Как мне скачать изменения и как-то обьеденить ?
[18:50:15] madmercen is now away
[18:50:28] fuzzy: hg pull?
[18:50:32] gigimon is now away
[18:50:43] λ: сделал
[18:50:43] fuzzy: а потом hg merge
[18:51:12] λ: abort: outstanding uncommitted changes
(use 'hg status' to list changes)
[18:51:18] огыешсук is now away
[18:51:25] fuzzy: ну надо сначала свои изменения закомитить
[18:51:32] fuzzy: hg status to list changed
[18:51:37] fuzzy: hg add
[18:51:44] fuzzy: hg commit
[18:51:48] fuzzy: hg mege
[18:52:19] λ: я сделал комит перед пулом
[18:52:49] fuzzy: мало сделать комит. надо, чтобы не было изменений выдающихся
[18:52:59] madmercen is now online
[18:53:30] λ: hg status to list changed что это за команда ?
[18:53:36] λ: я не пойму как надо
[18:54:33] fuzzy: hg status покажет какие у тебя изменения незакомичены
[18:56:41] λ: я понял . я пару файлов удалил
[18:57:47] огыешсук is now away
[18:57:47] огыешсук is now online
[18:57:50] bliznezz is now offline
[19:00:09] λ is now online
[19:03:04] огыешсук is now away
[19:04:47] andreyjkee is now offline
[19:06:09] madmercen is now away
[19:08:05] огыешсук is now away
[19:08:19] λ: я сделал hg merge
3 files to edit
[19:13:28] gigimon is now away
[19:13:31] gigimon is now online
[19:13:45] Сволота is now online
[19:16:09] madmercen is now xa
[19:18:48] огыешсук is now away
[19:18:49] огыешсук is now online
[19:20:23] Сволота is now away
[19:24:13] огыешсук is now away
[19:24:37] огыешсук is now online
[19:30:23] Сволота is now xa
[19:32:09] ambush is now online
[19:32:47] andreyjkee is now online
[19:37:44] Tony is now away
[19:40:39] andreyjkee is now offline
[19:42:00] Tony is now online
[19:43:25] remo is now away
[19:45:40] gigimon is now offline
[19:48:50] andreyjkee is now online
[19:49:13] andreyjkee is now offline
[19:58:39] огыешсук is now offline
[20:06:52] bliznezz is now away
[20:07:04] ambush is now online
[20:16:35] ambush is now away
[20:17:43] Сволота is now online
[20:21:46] ambush is now online
[20:23:29] Сволота is now away
[20:25:55] obivan is now away
[20:26:25] madmercen is now online
[20:26:47] ambush is now away
[20:28:41] obivan is now online
[20:31:04] ambush is now online
[20:31:27] madmercen is now away
[20:33:29] Сволота is now xa
[20:35:13] fuzzy is now online
[20:36:22] λ is now offline
[20:36:55] λ is now online
[20:37:29] fuzzy is now online
[20:41:27] madmercen is now xa
[20:44:55] ambush is now away
[20:45:14] ambush is now online
[20:50:17] ambush is now away
[21:00:17] ambush is now xa
[21:05:08] ambush is now online
[21:06:33] λ is now online
[21:09:55] Сволота is now online
[21:10:09] ambush is now away
[21:19:08] fuzzy is now online
[21:20:09] ambush is now xa
[21:26:04] fuzzy is now online
[21:45:17] Сволота is now away
[21:47:43] Сволота is now online
[22:03:10] λ: у меня есть бранч
>hg branches
somef 5:3a963bf66550
default 4:58b90c21e97c (неактивна)
[22:04:18] λ: я хочу изменить смержить их как-то и отправить изменения, но мне пишет
hg merge
прервано: нечего сливать
[22:05:07] λ: hg merge
прервано: нечего сливать
λ ~/lightning>hg push
проталкиваем в https://hg.bitbucket.org <https://hg.assembla.com/lightning_sys>
поиск изменений
прервано: push создаст новые ветки в отдалённом хранилище: somef!
(используйте 'hg push --new-branch' чтобы создать новые ветки ветки
в отдаленном хранилище)
[22:05:28] λ: я что-то не пойму что надо делать
[22:09:45] fuzzy is now online
[22:27:57] fuzzy: надо себе стянуть ветки с репозитория
[22:28:04] λ is now offline
[22:28:17] λ is now online
[22:28:19] fuzzy: смержить свою ветку (которая торчит из ветки репозитория + твои комиты) с новым состоянием ветки репозитория
[22:28:23] fuzzy: в одну ветку
[22:28:25] fuzzy: и запушить её
[22:28:38] fuzzy: есть на сервере комит 1
[22:28:49] fuzzy: ты его стянул и закомитил 1 <- 2
[22:28:59] fuzzy: а кто-то другой на сервер закомитил 1 <- 3
[22:29:08] fuzzy: если ты сейчас запушишь, то будет две головы - 2 и 3
[22:29:23] fuzzy: тебе надо стянуть ветку с сервера, смержить 2 и 3 в одну голову и запушить обратно
[22:31:19] λ: вроде понял. хотя до этого решил по другому :)
[22:31:38] λ: придут новые комиты попробую
[22:33:29] λ is now online
[22:37:34] ambush is now online
[22:43:39] zerling is now online
[23:09:58] λ is now offline
[23:10:15] λ is now online
[23:11:00] λ is now offline
[23:11:13] λ is now online
[23:14:05] λ is now offline
[23:14:22] zerling is now offline
[23:14:28] λ is now online
[23:31:24] ambush is now offline
[23:32:34] ambush is now online