| 00:37.07 | *** join/#asterisk-dev mjordan (~mjordan@user-69-1-6-49.knology.net) |
| 00:37.07 | *** mode/#asterisk-dev [+o mjordan] by ChanServ |
| 01:33.28 | *** join/#asterisk-dev otherwiseguy (~otherwise@c-71-207-246-110.hsd1.al.comcast.net) |
| 02:03.11 | *** join/#asterisk-dev leifmadsen (~Leif@asterisk/documenteur-extraordinaire/blitzrage) |
| 02:03.11 | *** mode/#asterisk-dev [+o leifmadsen] by ChanServ |
| 04:36.27 | *** join/#asterisk-dev sruffell (~Adium@asterisk/the-kernel-guy/sruffell) |
| 04:36.27 | *** mode/#asterisk-dev [+o sruffell] by ChanServ |
| 05:26.00 | *** join/#asterisk-dev otherwiseguy (~otherwise@75.76.71.96) |
| 06:00.58 | *** join/#asterisk-dev irroot (~gregory@197.110.41.134) |
| 06:08.03 | *** join/#asterisk-dev apten (~apten@carbon.gonicus.de) |
| 06:09.39 | *** join/#asterisk-dev irroot (~gregory@197.171.134.38) |
| 06:10.04 | *** part/#asterisk-dev irroot (~gregory@197.171.134.38) |
| 06:25.59 | *** join/#asterisk-dev srbh (~srbh@121.243.141.69) |
| 07:27.51 | *** join/#asterisk-dev pnlarsson (~niklas@fw1.gml.g.icnet.infracom.se) |
| 07:48.08 | wdoekes2 | thanks JunK-Y :) |
| 07:50.33 | *** join/#asterisk-dev schmidts (~schmidts@Lo20-rt01.lm33.sil.at) |
| 07:50.35 | schmidts | good morning |
| 08:53.04 | *** join/#asterisk-dev Gugge (gugge@kriminel.dk) |
| 09:09.36 | *** join/#asterisk-dev leifmadsen (~Leif@asterisk/documenteur-extraordinaire/blitzrage) |
| 09:09.36 | *** mode/#asterisk-dev [+o leifmadsen] by ChanServ |
| 09:46.30 | *** join/#asterisk-dev tzafrir_laptop (~tzafrir@local.xorcom.com) |
| 09:46.30 | *** mode/#asterisk-dev [+o tzafrir_laptop] by ChanServ |
| 10:05.03 | *** join/#asterisk-dev oron_laptop (~oron_lapt@local.xorcom.com) |
| 10:05.43 | *** join/#asterisk-dev tamiel (~tamiel@85-171-171-179.rev.numericable.fr) |
| 11:43.38 | *** join/#asterisk-dev merbanan (~benjamin@c-83-233-242-127.cust.bredband2.com) |
| 12:54.13 | *** join/#asterisk-dev kpfleming (~kpfleming@asterisk/digium-director-of-software-tech/kpfleming) |
| 12:54.13 | *** mode/#asterisk-dev [+o kpfleming] by ChanServ |
| 13:18.56 | *** join/#asterisk-dev leifmadsen (~Leif@asterisk/documenteur-extraordinaire/blitzrage) |
| 13:18.56 | *** mode/#asterisk-dev [+o leifmadsen] by ChanServ |
| 14:05.14 | *** join/#asterisk-dev serafie (~erin@nat/digium/x-mwbediugkdlzwguh) |
| 14:09.42 | *** join/#asterisk-dev mjordan1 (~mjordan@nat/digium/x-ihwotcswkmvowzkz) |
| 14:11.50 | *** part/#asterisk-dev mjordan1 (~mjordan@nat/digium/x-ihwotcswkmvowzkz) |
| 14:13.15 | *** join/#asterisk-dev mjordan (~mjordan@nat/digium/x-akbuhzfjlvtyjjnq) |
| 14:13.15 | *** mode/#asterisk-dev [+o mjordan] by ChanServ |
| 14:17.39 | *** join/#asterisk-dev malcolmd (~malcolmd@pdpc/sponsor/digium/malcolmd) |
| 14:17.39 | *** mode/#asterisk-dev [+o malcolmd] by ChanServ |
| 14:17.45 | *** join/#asterisk-dev newbe (~Newb@c-98-226-119-225.hsd1.il.comcast.net) |
| 15:09.58 | *** join/#asterisk-dev kpfleming (~kpfleming@asterisk/digium-director-of-software-tech/kpfleming) |
| 15:09.58 | *** mode/#asterisk-dev [+o kpfleming] by ChanServ |
| 15:18.49 | schmidts | how can i solve an svn problem with branch-1.8-merged? |
| 15:19.06 | schmidts | svn diff gives me a lot of output for this file and svn resolved . didnt helped |
| 15:19.41 | wdoekes2 | schmidts: there's probably a conflict in a file, not in the properties of . |
| 15:19.52 | wdoekes2 | svn stat |
| 15:20.07 | schmidts | <PROTECTED> |
| 15:20.07 | schmidts | X menuselect |
| 15:21.28 | wdoekes2 | oh.. you did resolve the conflict state |
| 15:21.44 | wdoekes2 | svn propedit svn:branch-1.8-merged . |
| 15:21.53 | wdoekes2 | does it have <<< and >>> in it? |
| 15:22.17 | wdoekes2 | s/svn:// |
| 15:23.33 | schmidts | its empty when i use svn propedit |
| 15:23.57 | wdoekes2 | you did remove the "svn:" ? |
| 15:25.16 | schmidts | no ;) sorry |
| 15:28.06 | schmidts | ok slowly, if i do svn propedit branch-1.8-merged . |
| 15:28.24 | schmidts | there is no <<< or >>> in it |
| 15:28.31 | *** join/#asterisk-dev jrose_atDigium (~jrose_atD@nat/digium/x-itxpxwcwjkxpumea) |
| 15:36.11 | wdoekes2 | then I don't think there is a conflict |
| 15:36.52 | wdoekes2 | if you do an svn diff, you will probably see one looong line removed and one added, where the second line has exactly one more revision number |
| 15:38.46 | schmidts | no there are more than one rev number but basically yes |
| 15:42.51 | *** join/#asterisk-dev sruffell (~Adium@asterisk/the-kernel-guy/sruffell) |
| 15:42.51 | *** mode/#asterisk-dev [+o sruffell] by ChanServ |
| 15:43.12 | schmidts | wdoekes2 would it help if i remove everything i get with propedit and do a svn up? |
| 15:57.25 | schmidts | i have removed the whole folder for 10 and now with a clean checkout its working :( |
| 16:00.47 | *** join/#asterisk-dev otherwiseguy (~otherwise@nat/digium/x-svivnomboxtvubrn) |
| 16:04.37 | *** join/#asterisk-dev putnopvut (~putnopvut@asterisk/master-of-queues/mmichelson) |
| 16:04.37 | *** mode/#asterisk-dev [+o putnopvut] by ChanServ |
| 16:39.34 | *** join/#asterisk-dev asilva (~asilva@gandalf.ai.unesp.br) |
| 17:08.57 | *** join/#asterisk-dev moy (~moy@173.239.155.74) |
| 17:21.36 | *** join/#asterisk-dev anthm (~anthm@freeswitch/developer/anthm) |
| 17:23.27 | *** join/#asterisk-dev bklang (~bklang@2001:470:8:5de:225:ff:fe49:f8cd) |
| 17:45.22 | file | looks around |
| 19:50.16 | *** join/#asterisk-dev jeffg (~jeffg@pdpc/supporter/professional/jeffg) |
| 20:43.42 | *** join/#asterisk-dev moy (~moy@173.239.155.74) |
| 20:59.53 | *** join/#asterisk-dev ccesario (~ccesario@189.29.54.144) |
| 22:14.55 | *** join/#asterisk-dev ccesario (~ccesario@189.29.54.144) |
| 22:36.02 | *** join/#asterisk-dev tamiel (~tamiel@85-171-171-179.rev.numericable.fr) |
| 22:48.08 | *** part/#asterisk-dev mjordan (~mjordan@nat/digium/x-akbuhzfjlvtyjjnq) |