[asterisk-dev] [asterisk-commits] lathama: branch 1.8 r305987 - in /branches/1.8: ./ configs/ phoneprov/

Andrew Latham lathama at gmail.com
Thu Feb 3 13:53:33 CST 2011

On Thu, Feb 3, 2011 at 2:21 PM, Russell Bryant <russell at digium.com> wrote:
> ----- Original Message -----
>> I did a ./configure, then make, then make install on the repotools. I
>> think I am only having this issue on my desktop at the office and not
>> on my laptop. I will clean and reinstall the tools.
> It could be that the version of svnmerge that you are using is not the same one we have in repotools.  We had it in our repo since we had some custom modifications.  Maybe the equivalent functionality made it upstream but the commit message generation is different.  I don't know ... just something to look at.
> --
> Russell Bryant

I had a chat with Jeff P. and it looks like I needed to clean house
after a merge.  A "svn revert -R . " made things happy.... so far....

~~~ Andrew "lathama" Latham lathama at gmail.com ~~~

More information about the asterisk-dev mailing list