| 00:42.19 | *** join/#asterisk-bugs leifmadsen (n=Leif@asterisk/documenteur-extraordinaire/blitzrage) |
| 00:42.19 | *** mode/#asterisk-bugs [+o leifmadsen] by ChanServ |
| 00:50.33 | *** join/#asterisk-bugs Deeewayne (n=dwayne@76.29.245.9) |
| 00:50.33 | *** mode/#asterisk-bugs [+o Deeewayne] by ChanServ |
| 01:05.49 | *** join/#asterisk-bugs elguero (n=elguero@ns1.nashuacs.com) |
| 03:55.26 | *** join/#asterisk-bugs lmsteffan (n=laurent@reef.ac-noumea.nc) |
| 05:14.33 | *** join/#asterisk-bugs bbryant (n=brett@c-68-59-22-114.hsd1.sc.comcast.net) |
| 05:14.33 | *** mode/#asterisk-bugs [+o bbryant] by ChanServ |
| 06:13.09 | *** join/#asterisk-bugs |Cybex| (n=John@80.100.126.176) |
| 06:19.09 | *** join/#asterisk-bugs Hatrix (n=Hatrix@213.201.24.127.static.user.ono.com) |
| 08:08.40 | *** join/#asterisk-bugs |Cybex| (n=John@80.100.126.176) |
| 08:44.09 | *** join/#asterisk-bugs Hatrix (n=Hatrix@213.201.24.127.static.user.ono.com) |
| 10:39.33 | *** join/#asterisk-bugs mvanbaak (n=michiel@asterisk/contributor-and-bug-marshal/mvanbaak) |
| 12:10.22 | *** join/#asterisk-bugs leifmadsen (n=Leif@asterisk/documenteur-extraordinaire/blitzrage) |
| 12:10.22 | *** mode/#asterisk-bugs [+o leifmadsen] by ChanServ |
| 12:18.53 | *** join/#asterisk-bugs eliel (n=eliels@200.61.172.61) |
| 12:58.46 | *** join/#asterisk-bugs Hatrix (n=Hatrix@213.201.24.127.static.user.ono.com) |
| 13:00.42 | *** join/#asterisk-bugs guax (n=guaxinim@unaffiliated/guaxinim) |
| 14:26.25 | *** join/#asterisk-bugs Victor_Yure (n=victor@unaffiliated/victoryure/x-837844) |
| 14:27.57 | *** join/#asterisk-bugs putnopvut (n=putnopvu@asterisk/master-of-queues/mmichelson) |
| 14:27.57 | *** mode/#asterisk-bugs [+o putnopvut] by ChanServ |
| 14:46.06 | Entomologist | *** CLOSED (15311) [dahdi (the module)] [patch] Call to a FXS DAHDI channel with Panasonic KX-TG4000 connected drops in 8 seconds randomly |
| 14:46.06 | Entomologist | Assigned to: dbailey |
| 14:46.06 | Entomologist | Reported by: vmikhelson Karma: 0 |
| 14:46.06 | Entomologist | https://issues.asterisk.org/view.php?id=15311 |
| 14:46.06 | Entomologist | ********************************************************* |
| 14:59.53 | *** join/#asterisk-bugs bbryant (n=brett@c-68-59-22-114.hsd1.sc.comcast.net) |
| 14:59.53 | *** mode/#asterisk-bugs [+o bbryant] by ChanServ |
| 15:00.02 | *** join/#asterisk-bugs jpeeler (n=jpeeler@asterisk/digium-software-dev/jpeeler) |
| 15:56.41 | *** join/#asterisk-bugs Deeewayne (n=dwayne@75.76.254.162) |
| 15:56.41 | *** mode/#asterisk-bugs [+o Deeewayne] by ChanServ |
| 16:42.49 | *** join/#asterisk-bugs Victor_Yure (n=victor@unaffiliated/victoryure/x-837844) |
| 16:49.05 | *** join/#asterisk-bugs Juggie (n=Juggie@CPE001601df17fb-CM001ceac25ada.cpe.net.cable.rogers.com) |
| 16:49.05 | *** mode/#asterisk-bugs [+o Juggie] by ChanServ |
| 16:52.42 | *** join/#asterisk-bugs bbryant (n=brett@c-68-59-22-114.hsd1.sc.comcast.net) |
| 16:52.42 | *** mode/#asterisk-bugs [+o bbryant] by ChanServ |
| 17:00.56 | *** join/#asterisk-bugs ccesario (n=ccesario@189-19-6-236.dsl.telesp.net.br) |
| 17:28.08 | Entomologist | *** CLOSED (14844) [CDR/General] Asterisk call file has CDR always set to NO ANSWER |
| 17:28.08 | Entomologist | Assigned to: mnicholson |
| 17:28.08 | Entomologist | Reported by: ruddy Karma: 3.75 |
| 17:28.08 | Entomologist | https://issues.asterisk.org/view.php?id=14844 |
| 17:28.08 | Entomologist | ********************************************************* |
| 18:01.52 | leifmadsen | putnopvut: ping |
| 18:02.01 | putnopvut | leifmadsen: gnop |
| 18:02.13 | leifmadsen | when you have a fews mins (ha!) can you review the patch I attached to 14496 since that is a big RR issue that could be finished up |
| 18:02.22 | putnopvut | M14496 |
| 18:02.25 | MuffinMan | [ready for review] [Asterisk] Applications/app_voicemail/IMAP 0014496: [patch] IMAP crash multiple callers / callers hangup at beep reported by vbcrlfuser (Karma: neutral) https://issues.asterisk.org/view.php?id=14496 |
| 18:02.31 | putnopvut | Oh, yeah. sure thing. |
| 18:03.21 | putnopvut | leifmadsen: ship it! |
| 18:04.33 | leifmadsen | w00t! |
| 18:05.11 | leifmadsen | hmmm... wonder how the heck I'm gonna merge this back to the non-tex version in earlier releases... |
| 18:05.29 | leifmadsen | guess I need to create a separate patch |
| 18:05.37 | russellb | non tex is just 1.4 |
| 18:05.49 | leifmadsen | right... |
| 18:06.15 | leifmadsen | so I'm not entirely sure the best practise for handling that situation where you have two different formats for the same docs |
| 18:06.32 | leifmadsen | s/releases.../release... |
| 18:06.47 | putnopvut | and s/practise/practice/ :P |
| 18:07.07 | seanbright | and s/for/four/ |
| 18:07.08 | putnopvut | I think the current method of handling such a situation is to do things by hand. |
| 18:07.36 | leifmadsen | putnopvut: funny, my spell checker told me practice was wrong, but practise as right :) |
| 18:07.39 | leifmadsen | must be a UK thing |
| 18:07.47 | putnopvut | well, it's a noun vs. verb thing. |
| 18:07.52 | leifmadsen | or my spell checker sucks |
| 18:07.54 | leifmadsen | or I suck.... |
| 18:07.59 | putnopvut | In the UK, practise is a verb, but practice is a noun. |
| 18:08.21 | putnopvut | Similar with license and licence. |
| 18:08.37 | leifmadsen | I need to look those up then and figure out the appropriate uses, but I'll do that later. |
| 18:08.45 | putnopvut | and even we differentiate between advise and advice in the same way. |
| 18:08.56 | leifmadsen | Once I do the manual merge to 1.4, do I need to do anything sort of block or record in SVN? |
| 18:08.57 | putnopvut | but that's probably because they're pronounced differently too. |
| 18:09.19 | leifmadsen | I have no idea why I said "sort" |
| 18:09.38 | putnopvut | I like puppies |
| 18:09.42 | leifmadsen | heh |
| 18:09.51 | Corydon76-dig | prefers bunnies |
| 18:10.11 | Corydon76-dig | They don't bark up a storm for no reason at all |
| 18:10.17 | leifmadsen | I know there was some odd stuff I had to do with XML docs in asterisk once I committed the two different versions, but I'm not sure if the developer documentation mentions these situations |
| 18:10.33 | leifmadsen | Corydon76-dig: there's usually a reason when rabbits bark |
| 18:10.34 | putnopvut | leifmadsen: it probably would be best to make the non-tex change to 1.4 first, and then make the same logical changes to the other branches but use your already-created tex patch file. |
| 18:11.06 | leifmadsen | putnopvut: right, but then I remember have to do an svn record (or something) for 1.4 |
| 18:11.13 | leifmadsen | for the XML docs |
| 18:11.27 | leifmadsen | if that is unnecessary, I'm happy to ignore it :) |
| 18:11.32 | putnopvut | Basically what I do is this: |
| 18:12.26 | putnopvut | Make the change in 1.4. Then run merge4trunk so that the revision is noted in branch-1.4-merged. Then revert any actual files which may have been changed in the merge (in your case I don't think there will be any), and apply your patch. Then commit. |
| 18:13.07 | putnopvut | So when the commit for trunk happens, it'll appear as though you are just merging the changes from 1.4, and in a way, you are, because they are the same changes, but you've actually manually patched things in trunk. |
| 18:15.14 | leifmadsen | thanks, I'll see what I can do :) |
| 18:36.10 | leifmadsen | hmmm wow... these two documents are quite a bit out of sync... |
| 18:46.25 | Entomologist | *** CLOSED (14496) [Applications/app_voicemail/IMAP] [patch] IMAP crash multiple callers / callers hangup at beep |
| 18:46.25 | Entomologist | Assigned to: mmichelson |
| 18:46.25 | Entomologist | Reported by: vbcrlfuser Karma: 0 |
| 18:46.25 | Entomologist | https://issues.asterisk.org/view.php?id=14496 |
| 18:46.25 | Entomologist | ********************************************************* |
| 18:52.36 | *** join/#asterisk-bugs mnicholson (n=mnichols@nat/digium/x-22e2e921f12eb219) |
| 18:52.41 | leifmadsen | putnopvut: ping |
| 18:53.03 | putnopvut | leifmadsen: powgn |
| 18:53.11 | leifmadsen | putnopvut: so I'm trying to now mergetrunk6 from trunk using the revision from trunk, but I'm getting a conflict on . |
| 18:53.29 | putnopvut | I get that a lot. I just svn revert . |
| 18:53.34 | leifmadsen | oh okie! |
| 18:53.39 | putnopvut | er.. |
| 18:53.40 | putnopvut | wait!! |
| 18:53.43 | putnopvut | leifmadsen: WAIT! |
| 18:53.48 | putnopvut | I meant svn resolved . |
| 18:53.49 | leifmadsen | doh... |
| 18:53.51 | putnopvut | not svn revert . |
| 18:53.59 | putnopvut | sorry about that one. |
| 18:54.11 | leifmadsen | I hit enter too soon... |
| 18:54.19 | leifmadsen | I need to revert that now I guess? :) |
| 18:54.33 | seanbright | yeah |
| 18:54.41 | seanbright | svn revert -R . |
| 18:54.51 | seanbright | do the mergetrunk6 again |
| 18:54.53 | seanbright | svn resolved . |
| 18:54.59 | seanbright | profit! |
| 18:55.38 | leifmadsen | svn commit -F ../merge.msg ? |
| 18:56.01 | leifmadsen | or just something funky I make up is fine? :) |
| 18:56.10 | seanbright | svn commit -F ../merge.msg |
| 18:56.38 | leifmadsen | ok... hope that worked. |
| 18:56.43 | leifmadsen | can someone verify? |
| 18:57.20 | putnopvut | All looks right by me. |
| 18:57.53 | leifmadsen | sweet deals |
| 18:57.57 | leifmadsen | 14496 is dead! |
| 18:58.06 | leifmadsen | (and by dead, I mean closed, and everything merged) |
| 19:16.38 | *** join/#asterisk-bugs |Cybex| (n=John@80.100.126.176) |
| 19:18.58 | Entomologist | *** CLOSED (15655) [Channels/chan_dahdi] [patch] Dialplan starts execution before call is accepted |
| 19:18.58 | Entomologist | Assigned to: rmudgett |
| 19:18.58 | Entomologist | Reported by: alecdavis Karma: 44.5 |
| 19:18.59 | Entomologist | https://issues.asterisk.org/view.php?id=15655 |
| 19:18.59 | Entomologist | ********************************************************* |
| 19:40.05 | Entomologist | *** CLOSED (15655) [Channels/chan_dahdi] [patch] Dialplan starts execution before call is accepted |
| 19:40.05 | Entomologist | Assigned to: rmudgett |
| 19:40.05 | Entomologist | Reported by: alecdavis Karma: 44.5 |
| 19:40.05 | Entomologist | https://issues.asterisk.org/view.php?id=15655 |
| 19:40.05 | Entomologist | ********************************************************* |
| 19:46.07 | *** join/#asterisk-bugs bbryant (n=brett@c-68-59-22-114.hsd1.sc.comcast.net) |
| 19:46.07 | *** mode/#asterisk-bugs [+o bbryant] by ChanServ |
| 20:36.46 | *** join/#asterisk-bugs |Cybex| (n=John@80.100.126.176) |
| 21:08.22 | *** join/#asterisk-bugs lmsteffan (n=laurent@reef.ac-noumea.nc) |
| 23:39.05 | *** join/#asterisk-bugs lmsteffan (n=laurent@reef.ac-noumea.nc) |