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

[bug] Merge resulting in a conflicted WC file does not produce a "conflicted" merge notification

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-08-08 23:31:56 CEST

On Wed, 02 Aug 2006, Kamesh Jayachandran wrote:

> Hi All,
> I found the bogus merge-notification status demonstrated by the attached
> shell script.

I'm seeing the same behavior with Subversion trunk and 1.4.x. A merge
which results in a conflicted file in your WC does not produce a
"conflicted" merge notification.

Modified shell script and output attached.

  • application/pgp-signature attachment: stored
Received on Tue Aug 8 23:32:56 2006

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

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