Merge on push?

[Martin Geisler]

Giorgos Keramidas <keramida at ceid.upatras.gr> writes:

> [...] You can still commit files in Subversion with a `mixed
> version' workspace. [...]

Wow, you're right! I had always though that Subversion maintained a
strict 1-1 correspondance between commits and revisions. But with this
behavior I can see people doing this:

  A: r0 -> edit foo.c, verify tests pass, commit -> r1
  B: r0 -> edit bar.c, verify tests pass, commit -> r2

Now r2 doesn't correspond to the view developer B had in his working
copy when he committed! And he tested a revision (r2 - changes in r1)
which cannot easily be reproduced. That is quite messy...

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multi-Party Computation) to Python. See: http://viff.dk/.