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

RE: Merge - File is both added 'A' and has a conflict 'C' - merge reports 'A'

From: Sander Striker <striker_at_apache.org>
Date: 2003-05-08 02:55:59 CEST

> From: Mike Mills [mailto:mike@rootbin.com]
> Sent: Thursday, May 08, 2003 2:51 AM

> It is possible for a file to have both a status of 'A' Added as well as 'C'
> Conflicted. However, this dual status is not reported when merging. It
> seems that the A is reported by the merge command. Is this the expected
> behavior?

No. This is a bug. Merge is reporting the file as added since it isn't
present in v, but is in b. It apparently doesn't look at t (if it did,
it would generate a conflict, since there is already a c in t). The contents
shouldn't even be merged without user consultation IMHO.

> So, it seems that in order to get a proper account of the results of a
> merge one must do the merge and then double check the result via svn
> status. Is this the appropriate work flow when merging?

No. This should not happen.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu May 8 02:56:50 2003

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.