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

Re: [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-10 01:16:15 CEST

On Wed, 09 Aug 2006, Garrett Rooney wrote:

> On 8/8/06, Daniel Rall <dlr@collab.net> wrote:
> >The callback is getting invoked with an action of
> >svn_wc_notify_update_add, which has no handling for a conflicts (only
> >for simple adds):
> >The handling for conflicts exists in the "case
> >svn_wc_notify_update_update" block.
> >
> >It appears that we're not expecting "svn_wc_notify_update_add" to ever
> >perform a merge -- and thus threaten to create conflicts -- as we're
> >seeing here.
> This is one of those things where you'd think it'd be easy to fix, but
> it actually causes other problems down the road. If you make it show
> conflicts on adds, then it breaks dry run merges in some cases...
> There's an issue about it, but I forget the number.

Garrett notes that he reported this issue a while back as:


I'll add a (failing) test case for it based on that shell script

- Dan

  • application/pgp-signature attachment: stored
Received on Thu Aug 10 01:18:01 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.