Merge on push?

[Michael Smith]

>> Yes, this is exactly the same with Subversion -- you cannot do a
>> commit unless you have an up-to-date SVN checkout. With SVN you must
>> do a 'svn update' to bring your checkout up-to-date, and this actually
>> does a merge for you.
> 
> Aha, interesting. Haven't used Subversion enough to know that. I was
> assuming that it behaves more or less like CVS here. Good point for
> argumentation.

SVN is behaving exactly like CVS in this case.
-- 
Michael Smith        | 61 386 304 560
Case and Tools Team  | 61 416 062 898
Thales Australia TCC |    S  37.82329
Melbourne, Victoria  |    E 144.95426
--------------------------------------------
Confidentiality Notice: This e-mail may contain confidential and/or 
privileged information and is intended solely for the addressee(s) 
named. If you have received this information in error, or are advised 
that you have been posted this e-mail by accident, please notify the 
sender by return e-mail, do not redistribute it, delete the e-mail and 
keep no copies.