| 00:30.53 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.127.205) |
| 00:36.50 | *** join/#asterisk-dev WIMPy (~wimpy@46.115.43.145) |
| 01:44.56 | *** join/#asterisk-dev sruffell (~sruffell@asterisk/the-kernel-guy/sruffell) |
| 01:44.56 | *** mode/#asterisk-dev [+o sruffell] by ChanServ |
| 02:23.33 | *** join/#asterisk-dev leifmadsen (~lmadsen@asterisk/documenteur-extraordinaire/blitzrage) |
| 02:23.33 | *** mode/#asterisk-dev [+o leifmadsen] by ChanServ |
| 02:30.55 | *** join/#asterisk-dev serafie (~erin@24.96.64.240) |
| 05:18.59 | *** join/#asterisk-dev Qwell (~north@pdpc/sponsor/digium/Qwell) |
| 05:18.59 | *** mode/#asterisk-dev [+o Qwell] by ChanServ |
| 05:27.19 | tzafrir | Author: sgriepentrog not defined in AUTHORS file |
| 05:45.29 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.127.164) |
| 06:17.41 | *** join/#asterisk-dev otherwiseguy (~otherwise@2605:a601:434:5101:3e97:eff:fe14:ef66) |
| 08:13.39 | *** join/#asterisk-dev vlad_starkov (~vlad_star@217.26.6.70) |
| 08:29.26 | *** join/#asterisk-dev vlad_starkov (~vlad_star@217.26.6.70) |
| 09:05.13 | *** join/#asterisk-dev tzafrir (~tzafrir@local.xorcom.com) |
| 09:05.13 | *** mode/#asterisk-dev [+o tzafrir] by ChanServ |
| 09:22.57 | *** join/#asterisk-dev WIMPy (~wimpy@e183095026.adsl.alicedsl.de) |
| 09:47.41 | wdoekes | tzafrir: which authors file? |
| 09:51.22 | tzafrir | wdoekes, in repotools |
| 09:52.14 | tzafrir | (Technically: in the git-svn one. But I generate it semi-automatically from the one in repo-tools) |
| 09:55.56 | wdoekes | repotools$ grep sgriep authors |
| 09:55.56 | wdoekes | sgriepentrog Scott Griepentrog <sgriepentrog@digium.com> |
| 09:56.19 | wdoekes | committed 1 okt |
| 09:56.43 | wdoekes | *oct. |
| 10:19.41 | *** join/#asterisk-dev Basssie90 (b.kooijan@5ED2711E.cm-7-3b.dynamic.ziggo.nl) |
| 10:21.11 | Basssie90 | I just installed a secound svn package from svn.digium.com. After this my first svn PRACK installation didn't work anymore. Can someone tell me how to merge two svn packages? |
| 10:28.07 | tzafrir | Basssie90, what do you mean by "svn package"? |
| 10:28.18 | tzafrir | svn checkout? |
| 10:30.24 | tzafrir | wdoekes, thank. Mirror updated |
| 10:38.25 | Basssie90 | yes svn checkout |
| 10:38.40 | Basssie90 | I just want to do 2 checkouts, is that possible? |
| 10:45.09 | Basssie90 | I need roibus-comfort-noise-trunk and darjeeling-prack-1.8 both on this server |
| 10:48.23 | wdoekes | Basssie90: you cannot do two checkouts, it doesn't work like that. you'd need to merge the changes from one checkout into the other |
| 10:48.36 | wdoekes | if one is based on trunk and the other on 1.8, that could prove to be difficult |
| 10:48.45 | *** join/#asterisk-dev vlad_starkov (~vlad_star@217.26.6.70) |
| 10:49.11 | Basssie90 | alright, end when they are both for 1.8 is that possible with svnmerge? |
| 10:49.51 | Basssie90 | trunk means last version is that correct? |
| 10:50.38 | wdoekes | I don't know what svnmerge does. I'd do it "by hand" by taking a diff against the unpatched branch and applying that patch onto whichever branch/version you want patched |
| 10:50.44 | wdoekes | yes, trunk is latest |
| 10:51.27 | wdoekes | but also least stable (potentially) |
| 10:51.47 | Basssie90 | hm, so I cannot use a trunk svn on 1.8 or is it always backwards compatible? because this svn is there from 1.2 to 11 (according to the readme files) |
| 10:52.16 | Basssie90 | stability is not a big problem on this server at the moment :) |
| 10:52.17 | tzafrir | wonders if someone managed to get team branches properly mirrored in git |
| 10:52.34 | tzafrir | I guess that svnmerge would have made a mess of them anyway |
| 10:53.04 | Basssie90 | ok. when I use two 1.8 svn checkouts will that work? |
| 10:53.45 | Basssie90 | like pinefrog-rtcp-1.8 and darjeeling-prack-1.8 (both from team Oej) |
| 10:53.50 | tzafrir | Basssie90, what you really need is the diff between each of the two and branches/1.8 |
| 10:54.07 | tzafrir | This diff is the "content" of the branch |
| 10:54.40 | Basssie90 | the diff from asterisk + svn or the two svn packages? |
| 10:54.44 | tzafrir | Get such a diff from one branch and try to apply it (patch -p0 --dry-run) on the other branch |
| 10:55.10 | tzafrir | I think you can get an svn diff with a remote branch |
| 10:55.31 | *** join/#asterisk-dev barbosa2 (~juliano.b@177.157.81.172) |
| 10:55.58 | tzafrir | svn diff http://svn.asterisk.org/svn/asterisk/branches/1.8 >diff # if I got the syntax right |
| 10:56.03 | tzafrir | or better: |
| 10:56.15 | tzafrir | svn diff -x -p http://svn.asterisk.org/svn/asterisk/branches/1.8 >diff |
| 10:57.21 | Basssie90 | svn: not all required revisions are specified |
| 10:57.26 | wdoekes | $ svn diff http://svn.asterisk.org/svn/asterisk/{branches/1.8,team/oej/darjeeling-prack-1.8} > darjeling-prack-1.8.patch |
| 10:58.10 | wdoekes | (add -x -p for more readability) |
| 11:00.33 | Basssie90 | thats a lot |
| 11:01.56 | Basssie90 | now this svn is already checked-out. can I make a diff from my current config to another svn checkout? |
| 11:02.35 | Basssie90 | like: svn diff "local config" > darjeling-prack-1.8-patch ? |
| 11:06.51 | Basssie90 | lets say different: when I checkout another svn, will it be added to my configuration or is it like a "clean install" of asterisk with just holding the config files? |
| 11:11.13 | wdoekes | Basssie90: if you're talking about the stuff in /etc/asterisk: that isn't touched unless you "make samples" |
| 11:15.54 | Basssie90 | alright but all the other files are they overwritten or combined? |
| 11:16.49 | Basssie90 | alright but all the other files are they overwritten or *aggregated? |
| 12:07.09 | tzafrir | Basssie90, 'make samples' will overrite files |
| 12:23.35 | Basssie90 | thanks tzafrir, I know enough for the moment and I will email team Oej about their SVN's |
| 12:24.13 | Basssie90 | thanks wdoekes too |
| 12:54.13 | *** join/#asterisk-dev vlad_starkov (~vlad_star@217.26.6.70) |
| 13:01.06 | *** join/#asterisk-dev tzafrir (~tzafrir@local.xorcom.com) |
| 13:01.06 | *** mode/#asterisk-dev [+o tzafrir] by ChanServ |
| 13:06.55 | *** join/#asterisk-dev tzafrir (~tzafrir@local.xorcom.com) |
| 13:07.02 | *** mode/#asterisk-dev [+o tzafrir] by ChanServ |
| 13:20.45 | *** join/#asterisk-dev vlad_sta_ (~vlad_star@217.26.6.70) |
| 14:57.41 | *** join/#asterisk-dev serafie (~erin@24.96.64.240) |
| 15:06.13 | *** join/#asterisk-dev [TK]D-Fender (~chatzilla@64.235.216.2) |
| 15:27.41 | *** join/#asterisk-dev serafie (~erin@24.96.64.240) |
| 15:44.08 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.125.42) |
| 15:46.05 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.125.42) |
| 16:33.42 | *** join/#asterisk-dev serafie (~erin@24.96.64.240) |
| 16:53.37 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.125.42) |
| 17:30.48 | *** join/#asterisk-dev sruffell (~sruffell@asterisk/the-kernel-guy/sruffell) |
| 17:30.49 | *** mode/#asterisk-dev [+o sruffell] by ChanServ |
| 17:41.40 | *** join/#asterisk-dev felipe_ (~felipe@unaffiliated/felipe) |
| 17:54.33 | *** join/#asterisk-dev serafie (~erin@24.96.64.240) |
| 18:03.07 | *** join/#asterisk-dev pabelanger (~pabelange@asterisk/contributor-and-bug-marshal/pabelanger) |
| 18:03.07 | *** mode/#asterisk-dev [+o pabelanger] by ChanServ |
| 18:16.19 | *** join/#asterisk-dev vlad_sta_ (~vlad_star@109.188.124.83) |
| 19:20.59 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.124.202) |
| 19:36.40 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.124.202) |
| 19:41.37 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.124.202) |
| 20:11.48 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.125.18) |
| 20:29.46 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.125.200) |
| 20:34.45 | *** join/#asterisk-dev Preatorian (~Preatoria@546906a1.cm-12-2a.dynamic.ziggo.nl) |
| 20:38.27 | *** join/#asterisk-dev serafie (~erin@24.96.64.240) |
| 21:22.14 | *** join/#asterisk-dev vlad_starkov (~vlad_star@109.188.126.74) |
| 21:43.42 | *** join/#asterisk-dev datachomper (~datachomp@nat/digium/x-pdoyuhvkigmspavw) |
| 21:43.45 | datachomper | sruffell: ping |
| 21:43.51 | sruffell | ping |
| 21:43.55 | sruffell | :/ pong |
| 21:43.59 | datachomper | sruffell: :-( |
| 21:44.22 | datachomper | I'm going to take a wild guess and say that you wrote the pri test :-P |
| 21:44.38 | datachomper | digital_audio_cic_did |
| 21:46.23 | sruffell | that wouldn't be me.... |
| 21:56.40 | *** join/#asterisk-dev tzafrir (~tzafrir@bzq-218-28-58.cablep.bezeqint.net) |
| 21:56.40 | *** mode/#asterisk-dev [+o tzafrir] by ChanServ |
| 22:08.28 | file | we have no names, man... no names |
| 22:08.30 | file | we are nameless |
| 22:31.28 | *** join/#asterisk-dev snuff-work (~snuffy@210.8.167.13) |
| 22:31.29 | *** mode/#asterisk-dev [+o snuff-work] by ChanServ |