[asterisk-dev] merge68 hangs

[Andrew Latham]

Then I was suffering from another issue.  :(  Back to the logs..

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



On Thu, Mar 3, 2011 at 10:32 PM, David Ruggles <thedavidfactor at gmail.com> wrote:
> On Thu, Mar 3, 2011 at 8:06 PM, Andrew Latham <lathama at gmail.com> wrote:
>>
>> On Thu, Mar 3, 2011 at 9:55 PM, David Ruggles <thedavidfactor at gmail.com>
>> wrote:
>> > I'm trying to apply a patch submitted with an issue (18907) and I
>> > applied it
>> > to 1.4 and 1.6.2, but when I do "merge68 309356" it gives the messages
>> > about
>> > deleting properties and just hangs. I've deleted my 1.8 directory and
>> > rechecked it out and it does the same thing. Any suggestions on what to
>> > do?
>> > Thanks!
>>
>> Welcome to my world...  Something like this was happening to me and I
>> could never track down the issue.  No matter how clean or pretty
>> things looked the properties would get erased.  I had this issue on a
>> 32bit Atom 270 system with Debian Lenny upgraded to Squeeze.
>>
>>
>> ~~~ Andrew "lathama" Latham lathama at gmail.com ~~~
>>
>
> My problem was that I hadn't followed the directions
> in https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage fully,
> specifically the "interactive-conflicts" part. Then the local version was
> messed up by previously failed merge attempts. Thanks to drumkilla, err...
> Russell, for pointing me in the right direction.
> --
> _____________________________________________________________________
> -- Bandwidth and Colocation Provided by http://www.api-digital.com --
>
> asterisk-dev mailing list
> To UNSUBSCRIBE or update options visit:
>   http://lists.digium.com/mailman/listinfo/asterisk-dev
>