search for: svnmerg

...'experimental' branch for changes that should > not be in the next stable release One potential problem with this is that it is easy for the branches to get out of sync with each other (some changes, e.g. the packaging removal in r1635, should be applied to both branches). I have used svnmerge.py at work for several months now, and it seems to be a decent way to keep several branches in sync (without forcing everyone to upgrade to Subversion 1.5, or switching to another SCM). Info: http://www.orcaware.com/svn/wiki/Svnmerge.py The script works by keeping track of previously merged (&qu...

...troduced in configure.ac at r259848, by adding AC_CONFIG_AUX_DIR(`pwd`) > The log for the commit reports ------------------------------------------------------------------------ > r259848 | qwell | 2010-04-28 22:32:14 +0200 (Wed, 28 Apr 2010) | 9 lines > > Merged revisions 259847 via svnmerge from > https://origsvn.digium.com/svn/asterisk/branches/1.4 > > ........ > r259847 | qwell | 2010-04-28 15:30:21 -0500 (Wed, 28 Apr 2010) | 1 line > > Add AC_CONFIG_AUX_DIR to configure script, so systems without install > can use install-sh from our source dir. > ........

Hi all, I am trying to connect to a softphone application using an Iax channel on Asterisk 1.4.30. I can do outbound calls, from softphone to asterisk, but not inbound from asterisk to softphone. I get the following Debug: ---------------------------------------------------------------------- ---------------------------------------------------------------------- Tx-Frame Retry[000] -- OSeqno:

...fficial repository to git and provide a mirror for those who want to use svn? This would have enormous benefits to third party users. Right now it is a royal pain to sync between the official repository and a local repository containing local changes because svn is simply not designed to do it. svnmerge.py is not a complete solution. It only solves a very small part of the problem. For various reasons we use svn on our end. I would like to set up a local git-svn mirror here so that I could take advantage of the power of git. Unforuntately, One cannot set up a git-svn ---> git-svn workfl...

...:53 +0000 [r56548] Kevin P. Fleming <kpfleming@digium.com> * codecs/codec_zap.c: update to match zaptel 1.4 API change that was committed a few minutes ago 2007-01-22 19:41 +0000 [r51411] Russell Bryant <russell@digium.com> * /: Blocked revisions 51410 via svnmerge ........ r51410 | russell | 2007-01-22 13:39:30 -0600 (Mon, 22 Jan 2007) | 3 lines Merge codec_zap support for the transcoder card. This is a standalone codec module so it will not affect anything else. ........ 2007-01-05 23:16 +0000 [r49705] Jason Parker <jpark...

> Its been discussed from time to time. I would like to see this as well, > but for an additional reasons: simpler branch management and faster > updates, etc. SVN handles directories better and merging head to/from a > branch is much easier (no tagging required because it remembers the > merges). > I'm not sure what you mean here by merge tracking but merge tracking in SVN

Hi, In /var/log/asterisk/full (Asterisk 1.6.2-rc6), I can see : [Dec 8 15:02:17] VERBOSE[10283] config.c: == Parsing '/var/spool/asterisk/voicemail/default/103/INBOX/msg0000.txt': [Dec 8 15:02:17] VERBOSE[10283] config.c: == Found [Dec 8 15:02:17] VERBOSE[10283] file.c: -- <SIP/103-00000784> Playing 'vm-message.gsm' (language 'fr') [Dec 8 15:02:18]

On Aug 10, 2009, at 6:40 PM, Erick Tryzelaar wrote: > On Mon, Aug 10, 2009 at 6:18 PM, Ray Fix<rayfix.ml at gmail.com> wrote: >> >> Hello, >> I had a question tangentially related to svn. I am very new to >> LLVM. It >> seems like a long road to making my own backend, but I am wading >> through the >> documentation and experimenting with

Has anyone got any neat solutions for Asterisk .conf file revision control? We have multiple Asterisk boxes here, that we'd like to maintain a _mostly_ common set of conf files on. They aren't all the same though. There's subtle differences. For example, in sip.conf, iax.conf etc, the bindaddr setting is different. Dundi.conf is very different between each system. At the moment I

To the subversion experts out there: I''d like to set up svn to maintain customizations to my base app for each client. A simple example would be to have a base CSS file and a custom one for each client. What is the best way to set up svn so I can ''co'' the trunc and then ''co'' customizations for each client on top of the base code. I''ve looked