On Thu, 18 May 2006, Daniel Rall wrote:
> 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?
My question about the file being binary is in part because what you
describe sounds like a bug which was recently fixed for 1.4:
Received on Thu May 18 19:07:40 2006
- application/pgp-signature attachment: stored