[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: svn merge doesn't show a conflict

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-08-04 16:01:53 CEST

> -----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. =(



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

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.