[Svnmerge] problems with added files

[Jack Repenning]

On Dec 20, 2006, at 7:30 AM, Konstantin Sobolev wrote:

> A thousand apologies! I somehow had that files as unversioned files in
> by branch WC. I don't know if it is possible, but a warning in such
> cases would would be great.

If you're merging over a versioned file that collides with an  
unversioned file in the receiving working copy, you _should_ get an  
error, shouldn't you?  You certainly do if you update and run into  
the same situation.

-==-
Jack Repenning
Director, Software Product Architecture
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
office: +1 650.228.2562
mobile: +1 408.835.8090
raindance: 844.7461
aim: jackrepenning
skype: jrepenning