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

[Andrew Latham]

On Thu, Feb 3, 2011 at 2:50 PM, Tilghman Lesher <tilghman at meg.abyt.es> wrote:
> On Thursday 03 February 2011 10:51:11 Andrew Latham wrote:
>> On Thu, Feb 3, 2011 at 1:40 PM, Russell Bryant <russell at digium.com>
> wrote:
>> > ----- Original Message -----
>> >
>> >> On Thu, Feb 3, 2011 at 12:54 PM, Russell Bryant <russell at digium.com>
>> >>
>> >> wrote:
>> >> > I see that the property is being updated to reflect that this is a
>> >> > merge from 1.6.2, but you do not appear to be using the commit
>> >> > message generated by svnmerge. Please do so for consistency. Take a
>> >> > look at other merge commits to see what I'm talking about.
>> >> >
>> >> > --
>> >> > Russell Bryant
>> >>
>> >> Is this the same issue that Paul B. mentioned? I really did not
>> >> understand what he was pointing at and asked about it. I will have a
>> >> chat with someone during my next commit to verify. I am following
>> >> Jeff P's. instructions to the letter.
>> >
>> > Same issue I think.
>> >
>> > How did you install the merge tools?  In theory, if you run "make
>> > install" from repotools, you will be using the same scripts as
>> > everyone else.
>> >
>> > --
>> > Russell Bryant
>>
>> 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.
>
> If you were using an earlier version of repotools, keep in mind that the
> default installation location changed from /usr to /usr/local.  You thus
> might have two copies of the repotools in different directories.
>
> --
> Tilghman

Only one install of the merge tools.  I am using subversion
1.6.12dfsg-4 at the moment.  I am running diffs of the .svn folders
and seeing some extra junk (dir_props etc...).  If  I find an issue I
will bring it to the list.  I have been adding comments to the
https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage if someone
has the time to make some updates to the page that would be great...
:)

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