| 00:09.14 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.125.194) |
| 00:13.25 | *** part/#asterisk-dev mjordan (~mjordan@nat/digium/x-ffhggasaexmqsdzt) |
| 01:08.55 | *** join/#asterisk-dev serafie (~erin@user-24-214-173-250.knology.net) |
| 01:23.40 | *** join/#asterisk-dev leifmadsen (~Leif@asterisk/documenteur-extraordinaire/blitzrage) |
| 01:23.40 | *** mode/#asterisk-dev [+o leifmadsen] by ChanServ |
| 01:39.54 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.125.180) |
| 01:53.50 | *** join/#asterisk-dev zerohalo (~zerohalo@c-174-62-142-83.hsd1.ma.comcast.net) |
| 02:02.21 | *** join/#asterisk-dev w9sh (~sph@50-79-224-193-static.hfc.comcastbusiness.net) |
| 02:30.38 | *** join/#asterisk-dev serafie (~erin@user-24-214-173-250.knology.net) |
| 04:09.30 | *** join/#asterisk-dev snuff-work (~snuffy@210.8.167.13) |
| 04:09.30 | *** mode/#asterisk-dev [+o snuff-work] by ChanServ |
| 04:12.28 | *** join/#asterisk-dev serafie1 (~erin@user-24-214-173-250.knology.net) |
| 04:32.48 | *** join/#asterisk-dev JunK-Y (~junky@pdpc/supporter/active/junk-y) |
| 05:41.57 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.126.250) |
| 06:09.17 | *** join/#asterisk-dev tzafrir (~tzafrir@bzq-218-28-58.cablep.bezeqint.net) |
| 06:09.18 | *** mode/#asterisk-dev [+o tzafrir] by ChanServ |
| 08:29.47 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.126.245) |
| 08:45.07 | *** join/#asterisk-dev tm1000 (tm1000@2600:3c01::f03c:91ff:fe70:fce6) |
| 09:43.01 | *** join/#asterisk-dev hehol (~hehol@2001:1438:1009:200:195a:f7d4:5c29:b9b9) |
| 10:19.01 | *** join/#asterisk-dev pc-m (~pcm@modemcable094.94-70-69.static.videotron.ca) |
| 11:34.08 | *** join/#asterisk-dev italorossi (~italoross@187.60.66.11) |
| 11:45.06 | *** join/#asterisk-dev w9sh (~sph@50-79-224-193-static.hfc.comcastbusiness.net) |
| 12:23.13 | *** join/#asterisk-dev italorossi (~italoross@187.60.66.11) |
| 12:45.44 | *** join/#asterisk-dev leifmadsen (~Leif@asterisk/documenteur-extraordinaire/blitzrage) |
| 12:45.44 | *** mode/#asterisk-dev [+o leifmadsen] by ChanServ |
| 13:00.40 | *** join/#asterisk-dev mjordan (~mjordan@nat/digium/x-kndduncyulzxxoab) |
| 13:00.40 | *** mode/#asterisk-dev [+o mjordan] by ChanServ |
| 13:22.36 | *** join/#asterisk-dev serafie (~erin@user-24-214-173-250.knology.net) |
| 13:30.37 | *** join/#asterisk-dev serafie (~erin@user-24-214-173-250.knology.net) |
| 13:34.24 | *** join/#asterisk-dev wdoekes (~walter@wjd.osso.nl) |
| 13:42.11 | *** join/#asterisk-dev putnopvut (~putnopvut@asterisk/master-of-queues/mmichelson) |
| 13:42.11 | *** mode/#asterisk-dev [+o putnopvut] by ChanServ |
| 14:13.23 | *** join/#asterisk-dev serafie (~erin@nat/digium/x-fiakdefaybwseqcn) |
| 14:33.31 | *** join/#asterisk-dev serafie (~erin@nat/digium/x-omnmsviezozzurvs) |
| 15:03.06 | *** join/#asterisk-dev vlad_starkov (~vlad_star@nat.canmos.ru) |
| 15:03.58 | *** join/#asterisk-dev zerohalo (~zerohalo@c-174-62-142-83.hsd1.ma.comcast.net) |
| 15:05.11 | *** join/#asterisk-dev serafie (~erin@nat/digium/x-xuvgxbdjstjsqywh) |
| 15:29.43 | *** join/#asterisk-dev sruffell (~sruffell@asterisk/the-kernel-guy/sruffell) |
| 15:29.44 | *** mode/#asterisk-dev [+o sruffell] by ChanServ |
| 15:32.28 | *** join/#asterisk-dev flapjacks (~flapjacks@wsip-184-183-148-253.ph.ph.cox.net) |
| 15:38.02 | *** join/#asterisk-dev vlad_starkov (~vlad_star@nat.canmos.ru) |
| 15:42.57 | *** join/#asterisk-dev vlad_starkov (~vlad_star@nat.canmos.ru) |
| 16:01.52 | *** join/#asterisk-dev vlad_sta_ (~vlad_star@nat.canmos.ru) |
| 16:09.33 | *** join/#asterisk-dev vlad_starkov (~vlad_star@nat.canmos.ru) |
| 16:31.43 | *** join/#asterisk-dev serafie (~erin@nat/digium/x-ascfvuribgxhvgtf) |
| 16:34.33 | *** join/#asterisk-dev vlad_starkov (~vlad_star@nat.canmos.ru) |
| 16:43.41 | *** join/#asterisk-dev vlad_sta_ (~vlad_star@nat.canmos.ru) |
| 16:46.12 | *** join/#asterisk-dev miguel3239 (~miguel323@2001:470:1f06:12c4::2) |
| 16:53.57 | *** join/#asterisk-dev anthm (~anthm@freeswitch/developer/anthm) |
| 16:57.10 | *** join/#asterisk-dev putnopvut (~putnopvut@asterisk/master-of-queues/mmichelson) |
| 16:57.10 | *** mode/#asterisk-dev [+o putnopvut] by ChanServ |
| 16:57.28 | *** join/#asterisk-dev mjordan (~mjordan@nat/digium/x-dxzfqhgszppuvxnw) |
| 16:57.28 | *** mode/#asterisk-dev [+o mjordan] by ChanServ |
| 17:04.56 | *** join/#asterisk-dev vlad_starkov (~vlad_star@nat.canmos.ru) |
| 19:00.33 | *** join/#asterisk-dev tm1000 (tm1000@2600:3c01::f03c:91ff:fe70:fce6) |
| 19:57.34 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.127.31) |
| 20:06.41 | *** join/#asterisk-dev ChanServ (ChanServ@services.) |
| 20:06.41 | *** mode/#asterisk-dev [+o ChanServ] by orwell.freenode.net |
| 20:29.49 | *** part/#asterisk-dev mjordan (~mjordan@nat/digium/x-dxzfqhgszppuvxnw) |
| 20:50.49 | *** join/#asterisk-dev [TK]D-Fender (~chatzilla@64.235.216.2) |
| 20:54.02 | *** join/#asterisk-dev tzafrir (~tzafrir@bzq-218-28-58.cablep.bezeqint.net) |
| 20:54.02 | *** mode/#asterisk-dev [+o tzafrir] by ChanServ |
| 21:09.57 | *** join/#asterisk-dev pabelanger (~pabelange@asterisk/contributor-and-bug-marshal/pabelanger) |
| 21:09.57 | *** mode/#asterisk-dev [+o pabelanger] by ChanServ |
| 21:10.22 | *** join/#asterisk-dev jmls1 (~julian@77.107.171.82) |
| 21:30.18 | *** join/#asterisk-dev w9sh (~sph@50-79-224-193-static.hfc.comcastbusiness.net) |
| 21:31.10 | *** part/#asterisk-dev w9sh (~sph@50-79-224-193-static.hfc.comcastbusiness.net) |
| 21:32.41 | moy | Qwell: ping? you around? |
| 21:36.26 | moy | having issues using merge11trunk script, hangs for a long time, then it does not generate the ../merge.msg file as I'd expect, eventually the script returns and the changes are applied to the working directory though |
| 21:37.06 | moy | using strace suggests the script hangs on the svn merge --ignore-ancestry command, waiting something from stdin, not sure yet about what though |
| 21:42.19 | moy | oh, seems like a property conflict of some sort, but the merge11trunk script does not expect that and does not print it either, can only be seen thru strace |
| 22:12.46 | *** join/#asterisk-dev w9sh (~sph@50-79-224-193-static.hfc.comcastbusiness.net) |
| 22:13.06 | *** part/#asterisk-dev w9sh (~sph@50-79-224-193-static.hfc.comcastbusiness.net) |
| 22:13.14 | putnopvut | moy: there's an interactive conflicts option in your svn configuration you probably need to disable. |
| 22:13.15 | *** join/#asterisk-dev italorossi (~italoross@187.61.168.117) |
| 22:13.47 | putnopvut | In your .subversion/config->[miscellany]->interactive-conflicts=no |
| 22:14.30 | putnopvut | You'll need to set that if you're using anything later than subversion 1.4. |
| 22:25.04 | moy | putnopvut: ah, that's pure gold, thanks ... that worked :) ... now, should I just ignore the conflict (in the . directory) as suggested by the wiki? |
| 22:25.54 | putnopvut | moy: that's probably safe. |
| 22:26.39 | *** join/#asterisk-dev pabelanger (~pabelange@asterisk/contributor-and-bug-marshal/pabelanger) |
| 22:26.39 | *** mode/#asterisk-dev [+o pabelanger] by ChanServ |
| 22:27.26 | moy | thanks ... darn it, I just realized the interactive-conflicts tip is given in the wiki but I missed it |
| 22:37.03 | *** join/#asterisk-dev serafie (~erin@user-24-214-173-250.knology.net) |