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

[Mike Mills <mi...@rootbin.com>]

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?

Steps to reproduce:

Lets say I have a project with a main trunk t a branch b and a common 
ancestor v. Now the following occurs:

1) Add a file c to t with contents:
this is c in main

2) Commit t

3) Add a file c to b with contents:
this is c in branch

4) Commit b

Now i go to do a merge :

cd t

svn merge  v b .

And I get:
A  c


BUT the file also has conflicts. So a "cat" reveals:

$ cat c
<<<<<<< .working
this is c in main
=======
this is c in branch
 >>>>>>> .yours

and svn status shows a conflict:

$ svn status c
C      c

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?



- Mike



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

[Sander Striker <st...@apache.org>]

> 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.


Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org