Strategies for push/merge problem?

[Martin Geisler]

"Taavi Burns" <taavi.burns at gmail.com> writes:

> On Fri, Jan 9, 2009 at 8:00 AM, Martin Geisler <mg at daimi.au.dk> wrote:
>> I expected Subversion to work like that too, but it turns out to be
>> false. Here I commit revision 2 without having updated to revision 1:
>
> I think this is a misleading statement. Subversion doesn't require a
> working copy to be at a single revision; it versions things per-thing.

You're right and thanks for the explaination.

It was one of those things which I must have kind of known all along,
but still surpriced me when I realised it. And I only realised it after
Mercurial made me do (trivial but) explicit merges.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20090109/f4d64150/attachment-0001.asc>