[Python-Dev] I am now lost

[Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

John Arbash Meinel john at arbash-meinel.com
Tue Mar 22 10:30:22 CET 2011

Previous message: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?
Next message: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

Previous message: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?
Next message: [Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the Python-Dev mailing list