-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 3/21/2011 10:48 PM, "Martin v. Löwis" wrote: >> It does so at the *tree* level, not at an individual file level. > > Thanks - I stand corrected. I was thinking about the file level only (at > which it doesn't do server-side merging - right?). > > Regards, > Martin
AIUI, you are correct, svn doesn't do server-side content merging. John =:-> -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk2IbC4ACgkQJdeBCYSNAANhCQCgpmKnD7QmZQ8Cv1DGPkJw22Q0 /uYAoMc0VNoLq2VMFpu3+uzS2M93x08P =TL8l -----END PGP SIGNATURE----- _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
