RE: svn merge doesn't show a conflict

> -----Original Message-----
> From: Jens Seidel [mailto:jensseidel@users.sf.net]
>
> I noticed that svn merge doesn't show a conflict if it adds a
> conflicting
> file. The merge outputs
> A file
> instead of the expected
> C file
> whereas svn status shows
> ? file.merge-left.r0
> ? file.merge-right.r3
> ? file.working
> C file
>

Yup. I noticed this earlier. It was going to be fixed in 1.4.0 as a
simple patch, but things got complicated, and it wasn't fixed. =(

http://svn.haxx.se/users/archive-2006-07/0404.shtml
http://svn.haxx.se/dev/archive-2006-07/0506.shtml
        http://svn.haxx.se/dev/archive-2006-07/0724.shtml

*****

The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. 162

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 4 16:04:03 2006