<div class="gmail_quote">On Thu, Mar 3, 2011 at 8:06 PM, Andrew Latham <span dir="ltr"><<a href="mailto:lathama@gmail.com">lathama@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div><div></div><div class="h5">On Thu, Mar 3, 2011 at 9:55 PM, David Ruggles <<a href="mailto:thedavidfactor@gmail.com">thedavidfactor@gmail.com</a>> wrote:<br>
> I'm trying to apply a patch submitted with an issue (18907) and I applied it<br>
> to 1.4 and 1.6.2, but when I do "merge68 309356" it gives the messages about<br>
> deleting properties and just hangs. I've deleted my 1.8 directory and<br>
> rechecked it out and it does the same thing. Any suggestions on what to do?<br>
> Thanks!<br>
<br>
</div></div>Welcome to my world... Something like this was happening to me and I<br>
could never track down the issue. No matter how clean or pretty<br>
things looked the properties would get erased. I had this issue on a<br>
32bit Atom 270 system with Debian Lenny upgraded to Squeeze.<br> </blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
~~~ Andrew "lathama" Latham <a href="mailto:lathama@gmail.com">lathama@gmail.com</a> ~~~<br>
<font color="#888888"><br></font></blockquote><div> </div><meta http-equiv="content-type" content="text/html; charset=utf-8"><div>My problem was that I hadn't followed the directions in <a href="https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage">https://wiki.asterisk.org/wiki/display/AST/Subversion+Usage</a> 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.</div>
</div>