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

Re: svn 1.3.1 merge bug

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-05-18 17:15:56 CEST

On Thu, 18 May 2006, Thomas B�rkel wrote:

> HI!
>
> When a merge brings a new file and this file is already existing, versioned
> and non-emtpy at the destination wc, the merge command prints "A" as status,
> but the file is (correctly) conflicted.

Thomas, the problem here is that the status is "A" instead of "C"?

Is the content of the file from the "left" side of the merge different
from what's in the WC? Is the file is binary or non-binary? What
version of Subversion are you using?

-- 
Daniel Rall

  • application/pgp-signature attachment: stored
Received on Thu May 18 17:16:32 2006

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