Merge on push?

[Roman Kennke]

Hi there,

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

Now I'm confused. You beat me to installing SVN myself and try for real.
I know that CVS allows commits on a non-up-to-date checkout, as long as
this commit doesn't touch any files that have changed in the repository.
I was assuming that SVN behaves similar, but was told that SVN behaves
more like HG, in that it only allows commits on up-to-date checkouts,
regardless of the files that are touched by the commit. So what is it
now?

/Roman

-- 
Dipl.-Inform. (FH) Roman Kennke, Software Engineer, http://kennke.org
aicas Allerton Interworks Computer Automated Systems GmbH
Haid-und-Neu-Straße 18 * D-76131 Karlsruhe * Germany
http://www.aicas.com   * Tel: +49-721-663 968-0
USt-Id: DE216375633, Handelsregister HRB 109481, AG Karlsruhe
Geschäftsführer: Dr. James J. Hunt