| 00:24.32 | *** join/#asterisk-dev kpfleming (n=kpflemin@asterisk/digium-director-of-software-tech/kpfleming) |
| 00:24.32 | *** mode/#asterisk-dev [+o kpfleming] by ChanServ |
| 00:47.04 | *** join/#asterisk-dev davevg (n=davevg-b@75.97.64.33) |
| 02:34.06 | *** join/#asterisk-dev anthm][ (n=anthm@CPE-72-128-94-253.wi.res.rr.com) |
| 02:34.31 | *** join/#asterisk-dev anthm (n=anthm@freeswitch/developer/anthm) |
| 06:08.21 | *** join/#asterisk-dev obnauticus (n=obnautic@about/windows/regular/obnauticus) |
| 06:17.10 | *** join/#asterisk-dev |Cybex| (n=John@80.100.126.176) |
| 07:14.17 | *** join/#asterisk-dev errotan (n=errotan@5403E588.catv.pool.telekom.hu) |
| 09:26.29 | *** join/#asterisk-dev thansen (n=thansen@76.27.110.194) |
| 10:24.26 | *** join/#asterisk-dev errotan (n=errotan@5403E588.catv.pool.telekom.hu) |
| 11:37.39 | *** join/#asterisk-dev errotan (n=errotan@5403E588.catv.pool.telekom.hu) |
| 13:27.30 | *** join/#asterisk-dev |Cybex| (n=John@80.100.126.176) |
| 14:46.19 | *** join/#asterisk-dev msetim (n=setim@201.86.35.76.dynamic.adsl.gvt.net.br) |
| 15:17.13 | *** join/#asterisk-dev thansen (n=thansen@76.27.110.194) |
| 15:43.50 | *** join/#asterisk-dev DarkRift (n=dark@65.92.171.53) |
| 16:00.49 | *** join/#asterisk-dev artemmakhutov (n=artemmak@ip-95-222-243-116.unitymediagroup.de) |
| 16:23.17 | *** join/#asterisk-dev jeffg (n=jeffg@pdpc/supporter/active/jeffg) |
| 16:30.14 | *** join/#asterisk-dev seanbright (n=sean@asterisk/contributor-and-bug-marshal/seanbright) |
| 16:30.14 | *** mode/#asterisk-dev [+o seanbright] by ChanServ |
| 16:58.09 | *** join/#asterisk-dev seanbright (n=sean@asterisk/contributor-and-bug-marshal/seanbright) |
| 16:58.09 | *** mode/#asterisk-dev [+o seanbright] by ChanServ |
| 16:59.43 | *** join/#asterisk-dev seanbright (n=sean@asterisk/contributor-and-bug-marshal/seanbright) |
| 16:59.43 | *** mode/#asterisk-dev [+o seanbright] by ChanServ |
| 17:33.55 | *** join/#asterisk-dev Laureano (n=Laureano@190.245.101.140) |
| 18:11.38 | *** join/#asterisk-dev jeffg (n=jeffg@pdpc/supporter/active/jeffg) |
| 18:31.07 | *** join/#asterisk-dev Dovid (n=annon@213.8.121.90) |
| 20:52.25 | *** join/#asterisk-dev DarkRift (n=dark@65.92.171.53) |
| 21:26.58 | JunK-Y | id like to know if there's any info for astridevcon? I'd like to participate this year again, so i need to book my hotel with these days. |
| 22:12.39 | seanbright | JunK-Y: email jtodd |
| 22:21.01 | *** join/#asterisk-dev jeffg (n=jeffg@pdpc/supporter/active/jeffg) |
| 22:28.20 | russellb | we need to publish that info on the -dev list soon ... |
| 22:29.40 | snuff-home | wonders how long it will take to re-fix jabber branch from merge failure from a week ago |
| 22:36.02 | wedhorn | snuff-home: I'm trying to bring a skinny branch up to date that failed about 9 weeks ago .... |
| 22:36.38 | snuff-home | heh yer its fun.. |
| 22:36.51 | snuff-home | i dont even bother with the --avail tag |
| 22:37.00 | snuff-home | just doubles the time it takes |
| 22:37.40 | wedhorn | yeah, well my svn is pretty much non existent, so I'll just stumble through with the help of google |
| 22:37.59 | snuff-home | all you need to do is follow the ast dev guide |
| 22:38.27 | snuff-home | aka get the svnmerge tool from the repotools repo on asterisk.org |
| 22:38.35 | wedhorn | yep, it's the stuff that doesn't merge that causes me headaches |
| 22:38.41 | wedhorn | got it |
| 22:39.52 | russellb | $ cd mybranch ; svnmerge merge |
| 22:40.20 | russellb | (look at output, see which files are in conflict as they have a C by them. you can also see this by running "svn status") |
| 22:40.38 | russellb | open a file in conflict, search for "<<<" to find conflicts. Manually fix them. |
| 22:40.47 | russellb | When you're done ... $ svn resolved file_you_just_fixed.c |
| 22:40.55 | snuff-home | russellb: the main issue for us aussies.. is the speed we query svn server or at least that's my issue |
| 22:41.04 | snuff-home | yey.. almost no conflicts |
| 22:41.08 | russellb | Once all conflicts are resolved, re-enable automerge ... $ svn ps automerge '*' . ; svn commit -m "resolve, reset" |
| 22:41.21 | russellb | nods |
| 22:41.23 | russellb | sorry for that |
| 22:41.56 | snuff-home | its 1/2 our problem for living 10k km away :) |
| 22:42.08 | snuff-home | or not having a local US shell.. |
| 22:42.45 | russellb | and i can't offer you a shell accout on my boxes that are on that LAN ... something about network security or something ;-) |
| 22:43.02 | snuff-home | yer how petty are they :P |
| 22:43.43 | snuff-home | i dont even think i'd need to be on the same LAN.. just 150ms closer |
| 22:43.56 | snuff-home | in pings would be a good start |
| 22:44.59 | snuff-home | 250 -> 100ms |
| 22:46.13 | snuff-home | i will also try to remember how to merge those 2 documentation updates |
| 22:46.59 | snuff-home | i see falves has logged a bug and 'my business' comment by you :) |
| 22:48.26 | *** join/#asterisk-dev ghenry (n=ghenry@pdpc/supporter/monthlybyte/ghenry) |
| 22:56.11 | *** join/#asterisk-dev obnauticus (n=obnautic@about/windows/regular/obnauticus) |
| 22:59.56 | Laureano | It would be great to have a testing framework for different CDR scenarios. |
| 23:01.29 | Laureano | Especially if at some point the CDR engine is rewritten. |
| 23:02.49 | snuff-home | grr.. stupid svn thinks its in conflict |
| 23:11.49 | snuff-home | take that branch |
| 23:41.38 | wedhorn | i've been entering my svn cert password for the last 30 minutes, is their an easier way? |
| 23:42.15 | snuff-home | svnmerge |
| 23:42.24 | snuff-home | that command will do it automatically |
| 23:42.32 | snuff-home | after you type it the 1st time |
| 23:42.51 | wedhorn | not for me, I did "svnmerge merge", and I need to enter the password |
| 23:43.16 | wedhorn | repetitively |
| 23:43.49 | snuff-home | mm.. wierd |
| 23:44.00 | wedhorn | and rather painful |
| 23:44.26 | snuff-home | i just use svnmerge -f ../merge-commit.msg |
| 23:44.37 | snuff-home | maybe the -f helps? |
| 23:44.51 | snuff-home | your commit-msg doesn't need to have anything useful |
| 23:45.05 | snuff-home | because u define that when u svn commit |
| 23:45.21 | wedhorn | yeah maybe, I'll just keep going with the current one because I don't want to start from the beginning again |
| 23:45.54 | snuff-home | ok good luck |
| 23:46.06 | wedhorn | thanks |
| 23:49.33 | wedhorn | snuff-home: what rev is trunk up to? |
| 23:50.04 | snuff-home | 209957 |
| 23:50.08 | snuff-home | or there bouts |
| 23:50.33 | wedhorn | ouch, I'm merging in 199930 at the moment |
| 23:50.36 | snuff-home | 209959 is the latest.. was commit by me :) |
| 23:51.23 | snuff-home | wedhorn: some weeks ago i had merge broken 3 times in 1 week :( |
| 23:52.13 | wedhorn | ouch, |
| 23:52.33 | snuff-home | was because of the 'constify the world' stuff |
| 23:53.13 | wedhorn | I don't think I've dealt with the impact of that on my patch, yet... |