пёп©я─п╟п╡п╩п╣п╫п╦п╣ п╡п╣я─я│п╦я▐п╪п╦ п╡ Subversion

п▓я│п╣п╪ я│п╦я│я┌п╣п╪п╟п╪ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╡п╣я─я│п╦я▐п╪п╦ п©я─п╦я┘п╬п╢п╦я┌я│я▐ я─п╣я┬п╟я┌я▄ п╬п╢п╫я┐ п╦ я┌я┐ п╤п╣ п╬я│п╫п╬п╡п╫я┐я▌ п©я─п╬п╠п╩п╣п╪я┐: п╨п╟п╨ п©я─п╣п╢п╬я│я┌п╟п╡п╦я┌я▄ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐п╪ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ я│п╬п╡п╪п╣я│я┌п╫п╬пЁп╬ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ п╦п╫я└п╬я─п╪п╟я├п╦п╦, п©я─п╦ я█я┌п╬п╪ п╫п╣ п©п╬п╥п╡п╬п╩я▐я▐ п╦п╪ п╫п╟я│я┌я┐п©п╟я┌я▄ п╢я─я┐пЁ п╢я─я┐пЁя┐ п╫п╟ п©я▐я┌п╨п╦? п■п╣п╩п╬ п╡ я┌п╬п╪, я┤я┌п╬ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╦ п╥п╟п©я─п╬я│я┌п╬ п╪п╬пЁя┐я┌ я│п╩я┐я┤п╟п╧п╫п╬ п©п╣я─п╣п╥п╟п©п╦я│п╟я┌я▄ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, я│п╢п╣п╩п╟п╫п╫я▀п╣ п╢я─я┐пЁ п╢я─я┐пЁп╬п╪.

п═п╟я│я│п╪п╟я┌я─п╦п╡п╟п╣п╪я┐я▌ я│п╦я┌я┐п╟я├п╦я▌ п╦п╩п╩я▌я│я┌я─п╦я─я┐п╣я┌ п═п╦я│я┐п╫п╬п╨б═1.2, б╚п÷я─п╬п╠п╩п╣п╪п╟ п©п╬я┌п╣я─п╦ п╦п╥п╪п╣п╫п╣п╫п╦п╧б╩. п■п╬п©я┐я│я┌п╦п╪, я┐ п╫п╟я│ п╣я│я┌я▄ п╢п╡п╟ я│п╬я─п╟п╥я─п╟п╠п╬я┌я┤п╦п╨п╟ Б─■ п⌠п╟я─я─п╦ п╦ п║п╟п╩п╩п╦. п п╟п╤п╢я▀п╧ п╦п╥ п╫п╦я┘ я─п╣я┬п╦п╩ п╬п╢п╫п╬п╡я─п╣п╪п╣п╫п╫п╬ п╬я┌я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟я┌я▄ п╬п╢п╦п╫ п╦ я┌п╬я┌ п╤п╣ я└п╟п╧п╩ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟. п∙я│п╩п╦ п©п╣я─п╡я▀п╪ я│п╡п╬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ я│п╬я┘я─п╟п╫п╦я┌ п⌠п╟я─я─п╦, я┌п╬ п╡п╬п╥п╪п╬п╤п╫п╬, я┤я┌п╬ (п╫п╣я│п╨п╬п╩я▄п╨п╦п╪п╦ п╪п╦п╫я┐я┌п╟п╪п╦ п©п╬п╥п╤п╣) п║п╟п╩п╩п╦ п╪п╬п╤п╣я┌ п╫п╣п©я─п╣п╢п╫п╟п╪п╣я─п╣п╫п╫п╬ п©п╣я─п╣п╥п╟п©п╦я│п╟я┌я▄ п╦я┘ я│п╡п╬п╣п╧ п╫п╬п╡п╬п╧ п╡п╣я─я│п╦п╣п╧ я└п╟п╧п╩п╟. п²п╣я│п╪п╬я┌я─я▐ п╫п╟ я┌п╬, я┤я┌п╬ п╡п╣я─я│п╦я▐ я└п╟п╧п╩п╟ п⌠п╟я─я─п╦ п╫п╣ п╠я┐п╢п╣я┌ п©п╬п╩п╫п╬я│я┌я▄я▌ п©п╬я┌п╣я─я▐п╫п╟ (я┌п╟п╨ п╨п╟п╨ я│п╦я│я┌п╣п╪п╟ п©п╬п╪п╫п╦я┌ п╨п╟п╤п╢п╬п╣ п╦п╥п╪п╣п╫п╣п╫п╦п╣), п╡п╫п╣я│п╣п╫п╫я▀п╣ п⌠п╟я─я─п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╫п╣ п╠я┐п╢я┐я┌ п╬я┌я─п╟п╤п╣п╫я▀ п╡ п╫п╬п╡п╬п╧ п╡п╣я─я│п╦п╦ я└п╟п╧п╩п╟ п║п╟п╩п╩п╦, п©п╬я┌п╬п╪я┐ я┤я┌п╬, п╫п╟я┤п╦п╫п╟я▐, п╬п╫п╟ п╫п╣ п╡п╦п╢п╣п╩п╟ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п⌠п╟я─я─п╦. п═п╟п╠п╬я┌п╟ п⌠п╟я─я─п╦ я└п╟п╨я┌п╦я┤п╣я│п╨п╦ п©п╬я┌п╣я─я▐п╫п╟ Б─■ п╦п╩п╦, п©п╬ п╨я─п╟п╧п╫п╣п╧ п╪п╣я─п╣, п╬я┌я│я┐я┌я│я┌п╡я┐п╣я┌ п╡ п©п╬я│п╩п╣п╢п╫п╣п╧ п╡п╣я─я│п╦п╦ я└п╟п╧п╩п╟ Б─■ п©п╬ я│п╩я┐я┤п╟п╧п╫п╬я│я┌п╦. п п╟п╨ я─п╟п╥ я█я┌п╬п╧ я│п╦я┌я┐п╟я├п╦п╦ п╪я▀ п╦ я┘п╬я┌п╦п╪ п╦п╥п╠п╣п╤п╟я┌я▄!

п═п╦я│я┐п╫п╬п╨ 1.2. п÷я─п╬п╠п╩п╣п╪п╟ п©п╬я┌п╣я─п╦ п╦п╥п╪п╣п╫п╣п╫п╦п╧

п■п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ п╫п╣я│п╨п╬п╩я▄п╨п╬ п╟п╡я┌п╬я─п╬п╡ п╫п╣ п╪п╣я┬п╟п╩п╬ я─п╟п╠п╬я┌п╟я┌я▄ п╢я─я┐пЁ п╢я─я┐пЁя┐, п╪п╫п╬пЁп╦п╣ я│п╦я│я┌п╣п╪я▀ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╡п╣я─я│п╦я▐п╪п╦ п©я─п╦п╪п╣п╫я▐я▌я┌ п╪п╬п╢п╣п╩я▄ п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦п╣-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я─п╟п╥п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦п╣. п╜я┌п╟ п╪п╬п╢п╣п╩я▄ п╥п╟п©я─п╣я┴п╟п╣я┌ п╬п╢п╫п╬п╡я─п╣п╪п╣п╫п╫п╬п╣ я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟п╫п╦п╣ я└п╟п╧п╩п╟ п╫п╣я│п╨п╬п╩я▄п╨п╦п╪п╦ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐п╪п╦. п╜п╨я│п╨п╩я▌п╥п╦п╡п╫п╬я│я┌я▄ п╢п╬я│я┌я┐п©п╟ пЁп╟я─п╟п╫я┌п╦я─я┐п╣я┌я│я▐ п╠п╩п╬п╨п╦я─п╬п╡п╨п╟п╪п╦. п÷п╣я─п╣п╢ п╫п╟я┤п╟п╩п╬п╪ я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟п╫п╦я▐ п⌠п╟я─я─п╦ п╢п╬п╩п╤п╣п╫ б╚п╥п╟п╠п╩п╬п╨п╦я─п╬п╡п╟я┌я▄б╩ я└п╟п╧п╩. п∙я│п╩п╦ п⌠п╟я─я─п╦ п╥п╟п╠п╩п╬п╨п╦я─я┐п╣я┌ я└п╟п╧п╩, п║п╟п╩п╩п╦ я┐п╤п╣ п╫п╣ я│п╪п╬п╤п╣я┌ п╣пЁп╬ п╥п╟п╠п╩п╬п╨п╦я─п╬п╡п╟я┌я▄ п╦ п╡п╫п╣я│я┌п╦ я│п╡п╬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐. п∙п╧ п╬я│я┌п╟п╣я┌я│я▐ я┌п╬п╩я▄п╨п╬ я┤п╦я┌п╟я┌я▄ я└п╟п╧п╩ п╦ п╤п╢п╟я┌я▄, п©п╬п╨п╟ п⌠п╟я─я─п╦ п╥п╟п╨п╬п╫я┤п╦я┌ я│п╡п╬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╦ я│п╫п╦п╪п╣я┌ п╠п╩п╬п╨п╦я─п╬п╡п╨я┐. п⌡п╦я┬я▄ п©п╬я│п╩п╣ я┌п╬пЁп╬, п╨п╟п╨ п⌠п╟я─я─п╦ я─п╟п╥п╠п╩п╬п╨п╦я─я┐п╣я┌ я└п╟п╧п╩, п║п╟п╩п╩п╦ я│п╪п╬п╤п╣я┌ п©п╬п╩я┐я┤п╦я┌я▄ п╣пЁп╬, п╥п╟п╠п╩п╬п╨п╦я─п╬п╡п╟я┌я▄ п╦ п╫п╟я┤п╟я┌я▄ я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟п╫п╦п╣. п═п╦я│я┐п╫п╬п╨б═1.3, б╚п°п╬п╢п╣п╩я▄ п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦п╣-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я─п╟п╥п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦п╣б╩ п╢п╣п╪п╬п╫я│я┌я─п╦я─я┐п╣я┌ я█я┌п╬ п©я─п╬я│я┌п╬п╣ я─п╣я┬п╣п╫п╦п╣.

п═п╦я│я┐п╫п╬п╨ 1.3. п°п╬п╢п╣п╩я▄ п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦п╣-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я─п╟п╥п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦п╣

п÷я─п╬п╠п╩п╣п╪п╬п╧ п╪п╬п╢п╣п╩п╦ п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦п╣-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я─п╟п╥п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦п╣ я▐п╡п╩я▐п╣я┌я│я▐ я┌п╬, я┤я┌п╬ п╬п╫п╟ п╫п╣п╪п╫п╬пЁп╬ п╬пЁя─п╟п╫п╦я┤п╣п╫п╫п╟я▐ п╦ я┤п╟я│я┌п╬ п╢п╬я│я┌п╟п╡п╩я▐п╣я┌ п╫п╣я┐п╢п╬п╠я│я┌п╡п╟ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐п╪:

Subversion, CVS п╦ я─я▐п╢ п╢я─я┐пЁп╦я┘ я│п╦я│я┌п╣п╪ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╡п╣я─я│п╦я▐п╪п╦ п╡ п╨п╟я┤п╣я│я┌п╡п╣ п╟п╩я▄я┌п╣я─п╫п╟я┌п╦п╡я▀ п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦я▌ п©п╬п╩я▄п╥я┐я▌я┌я│я▐ п╪п╬п╢п╣п╩я▄я▌ п╨п╬п©п╦я─п╬п╡п╟п╫п╦п╣-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я│п╩п╦я▐п╫п╦п╣. п▓ я█я┌п╬п╧ п╪п╬п╢п╣п╩п╦ п╨п╟п╤п╢я▀п╧ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄я│п╨п╦п╧ п╨п╩п╦п╣п╫я┌ я│п╡я▐п╥я▀п╡п╟п╣я┌я│я▐ я│ я┘я─п╟п╫п╦п╩п╦я┴п╣п╪ п©я─п╬п╣п╨я┌п╟ п╦ я│п╬п╥п╢п╟п╣я┌ п©п╣я─я│п╬п╫п╟п╩я▄п╫я┐я▌ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ Б─■ п╩п╬п╨п╟п╩я▄п╫п╬п╣ п╬я┌я─п╟п╤п╣п╫п╦п╣ я└п╟п╧п╩п╬п╡ п╦ п╨п╟я┌п╟п╩п╬пЁп╬п╡ я┘я─п╟п╫п╦п╩п╦я┴п╟. п÷п╬я│п╩п╣ я█я┌п╬пЁп╬ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╦ я─п╟п╠п╬я┌п╟я▌я┌ п╬п╢п╫п╬п╡я─п╣п╪п╣п╫п╫п╬ п╦ п╫п╣п╥п╟п╡п╦я│п╦п╪п╬ п╢я─я┐пЁ п╬я┌ п╢я─я┐пЁп╟, п╦п╥п╪п╣п╫я▐я▐ я│п╡п╬п╦ п╩п╦я┤п╫я▀п╣ п╨п╬п©п╦п╦. п▓ п╨п╬п╫я├п╣ п╨п╬п╫я├п╬п╡, п╩п╦я┤п╫я▀п╣ п╨п╬п©п╦п╦ я│п╩п╦п╡п╟я▌я┌я│я▐ п╡ п╫п╬п╡я┐я▌, п╦я┌п╬пЁп╬п╡я┐я▌ п╡п╣я─я│п╦я▌. п·п╠я▀я┤п╫п╬ я│п╦я│я┌п╣п╪п╟ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╡п╣я─я│п╦я▐п╪п╦ п©п╬п╪п╬пЁп╟п╣я┌ п╡ я│п╩п╦я▐п╫п╦п╦, п╫п╬, я─п╟п╥я┐п╪п╣п╣я┌я│я▐, п╥п╟ п╣пЁп╬ п╨п╬я─я─п╣п╨я┌п╫п╬п╣ п╡я▀п©п╬п╩п╫п╣п╫п╦п╣ п╬я┌п╡п╣я┤п╟п╣я┌ я┤п╣п╩п╬п╡п╣п╨.

п▓ п╨п╟я┤п╣я│я┌п╡п╣ п©я─п╦п╪п╣я─п╟ п©я─п╣п╢п©п╬п╩п╬п╤п╦п╪, я┤я┌п╬ п⌠п╟я─я─п╦ п╦ п║п╟п╩п╩п╦ я│п╬п╥п╢п╟п╩п╦ я─п╟п╠п╬я┤п╦п╣ п╨п╬п©п╦п╦ п╬п╢п╫п╬пЁп╬ п╦ я┌п╬пЁп╬ п╤п╣ п©я─п╬п╣п╨я┌п╟, я│п╨п╬п©п╦я─п╬п╡п╟п╡ п╦я┘ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟. п·п╫п╦ я─п╟п╠п╬я┌п╟я▌я┌ п╬п╢п╫п╬п╡я─п╣п╪п╣п╫п╫п╬ п╦ п╡ я│п╡п╬п╦я┘ я─п╟п╠п╬я┤п╦я┘ п╨п╬п©п╦я▐я┘ п╡п╫п╬я│я▐я┌ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ п╬п╢п╦п╫ п╦ я┌п╬я┌ п╤п╣ я└п╟п╧п╩ п░. п÷п╣я─п╡п╬п╧ я│п╡п╬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ я│п╬я┘я─п╟п╫я▐п╣я┌ п║п╟п╩п╩п╦. п п╬пЁп╢п╟ п©п╬п╥п╤п╣ п⌠п╟я─я─п╦ п©п╬п©я▀я┌п╟п╣я┌я│я▐ я│п╬я┘я─п╟п╫п╦я┌я▄ я│п╡п╬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐, я┘я─п╟п╫п╦п╩п╦я┴п╣ п©я─п╬п╦п╫я└п╬я─п╪п╦я─я┐п╣я┌ п╣пЁп╬ п╬ я┌п╬п╪, я┤я┌п╬ п╣пЁп╬ я└п╟п╧п╩ п░ я┐я│я┌п╟я─п╣п╩. п■я─я┐пЁп╦п╪п╦ я│п╩п╬п╡п╟п╪п╦, я└п╟п╧п╩ п░ п╨п╟п╨п╦п╪ я┌п╬ п╬п╠я─п╟п╥п╬п╪ п╦п╥п╪п╣п╫п╦п╩я│я▐ я│п╬ п╡я─п╣п╪п╣п╫п╦, п╨п╬пЁп╢п╟ п╬п╫ п╣пЁп╬ п©п╬я│п╩п╣п╢п╫п╦п╧ я─п╟п╥ п╨п╬п©п╦я─п╬п╡п╟п╩. п÷п╬я█я┌п╬п╪я┐ п⌠п╟я─я─п╦ п©я─п╬я│п╦я┌ я│п╡п╬п╧ п╨п╩п╦п╣п╫я┌ я│п╩п╦я┌я▄ п╩я▌п╠я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟ п╡ п╣пЁп╬ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ я└п╟п╧п╩п╟ п░. п÷п╬ я│я┤п╟я│я┌п╩п╦п╡п╬п╪я┐ я│п╬п╡п©п╟п╢п╣п╫п╦я▌, п╦п╥п╪п╣п╫п╣п╫п╦я▐ п║п╟п╩п╩п╦ п╫п╣ п©п╣я─п╣п╨я─я▀п╡п╟я▌я┌я│я▐ я│ п╣пЁп╬ я│п╬п╠я│я┌п╡п╣п╫п╫я▀п╪п╦; п©п╬я│п╩п╣ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦я▐ п╬п╠п╬п╦я┘ п╫п╟п╠п╬я─п╬п╡ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╬п╫ я│п╬я┘я─п╟п╫я▐п╣я┌ я│п╡п╬я▌ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ п╬п╠я─п╟я┌п╫п╬ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣. п═п╦я│я┐п╫п╬п╨б═1.4, б╚п°п╬п╢п╣п╩я▄ п╨п╬п©п╦я─п╬п╡п╟п╫п╦п╣-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я│п╩п╦я▐п╫п╦п╣б╩ п╦ п═п╦я│я┐п╫п╬п╨б═1.5, б╚п°п╬п╢п╣п╩я▄ п╨п╬п©п╦я─п╬п╡п╟п╫п╦п╣-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я│п╩п╦я▐п╫п╦п╣ (п©я─п╬п╢п╬п╩п╤п╣п╫п╦п╣)б╩ п©п╬п╨п╟п╥я▀п╡п╟я▌я┌ я█я┌п╬я┌ п©я─п╬я├п╣я│я│.

п═п╦я│я┐п╫п╬п╨ 1.4. п°п╬п╢п╣п╩я▄ п╨п╬п©п╦я─п╬п╡п╟п╫п╦п╣-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я│п╩п╦я▐п╫п╦п╣

п═п╦я│я┐п╫п╬п╨ 1.5. п°п╬п╢п╣п╩я▄ п╨п╬п©п╦я─п╬п╡п╟п╫п╦п╣-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я│п╩п╦я▐п╫п╦п╣ (п©я─п╬п╢п╬п╩п╤п╣п╫п╦п╣)

п░ я┤я┌п╬ п╠я┐п╢п╣я┌, п╣я│п╩п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п║п╟п╩п╩п╦ п©п╣я─п╣п╨я─я▀п╡п╟я▌я┌ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п⌠п╟я─я─п╦? п╖я┌п╬ я┌п╬пЁп╢п╟? п╜я┌п╟ я│п╦я┌я┐п╟я├п╦я▐ п╫п╟п╥я▀п╡п╟п╣я┌я│я▐ п╨п╬п╫я└п╩п╦п╨я┌п╬п╪ п╦, п╨п╟п╨ п©я─п╟п╡п╦п╩п╬, я█я┌п╬ п╫п╣ я▐п╡п╩я▐п╣я┌я│я▐ п╠п╬п╩я▄я┬п╬п╧ п©я─п╬п╠п╩п╣п╪п╬п╧. п п╬пЁп╢п╟ п⌠п╟я─я─п╦ п©я─п╬я│п╦я┌ я│п╡п╬п╧ п╨п╩п╦п╣п╫я┌ я│п╩п╦я┌я▄ п©п╬я│п╩п╣п╢п╫п╦п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟ п╡ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п╣пЁп╬ п╨п╬п©п╦я▐ я└п╟п╧п╩п╟ п░ п©п╬п╪п╣я┤п╟п╣я┌я│я▐ п╫п╣п╨п╬я┌п╬я─я▀п╪ п╬п╠я─п╟п╥п╬п╪ п╨п╟п╨ п╫п╟я┘п╬п╢я▐я┴п╟я▐я│я▐ п╡ я│п╬я│я┌п╬я▐п╫п╦п╦ п╨п╬п╫я└п╩п╦п╨я┌п╟: я┐ п╫п╣пЁп╬ п╠я┐п╢п╣я┌ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п╡п╦п╢п╣я┌я▄ п╬п╠п╟ п╫п╟п╠п╬я─п╟ п╨п╬п╫я└п╩п╦п╨я┌я┐я▌я┴п╦я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╦ п╡я─я┐я┤п╫я┐я▌ я│п╢п╣п╩п╟я┌я▄ п╪п╣п╤п╢я┐ п╫п╦п╪п╦ п╡я▀п╠п╬я─. п÷п╬п╪п╫п╦я┌п╣, я┤я┌п╬ п÷п· п╫п╣ п╪п╬п╤п╣я┌ п╟п╡я┌п╬п╪п╟я┌п╦я┤п╣я│п╨п╦ я─п╟п╥я─п╣я┬п╟я┌я▄ п╨п╬п╫я└п╩п╦п╨я┌я▀; я┌п╬п╩я▄п╨п╬ я┤п╣п╩п╬п╡п╣п╨ я│п©п╬я│п╬п╠п╣п╫ п╨ п©п╬п╫п╦п╪п╟п╫п╦я▌ п╦ п╡я▀п©п╬п╩п╫п╣п╫п╦я▌ п╬я│п╪я▀я│п╩п╣п╫п╫п╬пЁп╬ п╡я▀п╠п╬я─п╟. п═п╟п╥я─п╣я┬п╦п╡ п╡я─я┐я┤п╫я┐я▌ п©п╣я─п╣п╨я─я▀п╡п╟я▌я┴п╦п╣я│я▐ п╦п╥п╪п╣п╫п╣п╫п╦я▐ Б─■ п╡п╬п╥п╪п╬п╤п╫п╬, п©п╬я│п╩п╣ п╬п╠я│я┐п╤п╢п╣п╫п╦я▐ я│ п║п╟п╩п╩п╦ Б─■ п╬п╫ п╪п╬п╤п╣я┌ п╠п╣п╥п╬п©п╟я│п╫п╬ я│п╬я┘я─п╟п╫п╦я┌я▄ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╫я▀п╧ я└п╟п╧п╩ п╬п╠я─п╟я┌п╫п╬ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣.

п°п╬п╢п╣п╩я▄ п╨п╬п©п╦я─п╬п╡п╟п╫п╦п╣-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я│п╩п╦я▐п╫п╦п╣ п╪п╬п╤п╣я┌ п╡я▀пЁп╩я▐п╢п╣я┌я▄ п╫п╣п╪п╫п╬пЁп╬ я┘п╟п╬я┌п╦я┤п╫п╬, п╬п╢п╫п╟п╨п╬, п╫п╟ п©я─п╟п╨я┌п╦п╨п╣ п╬п╫п╟ п╬я┌п╩п╦я┤п╫п╬ я─п╟п╠п╬я┌п╟п╣я┌. п÷п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╦ п╪п╬пЁя┐я┌ я─п╟п╠п╬я┌п╟я┌я▄ п©п╟я─п╟п╩п╩п╣п╩я▄п╫п╬, п╫п╣ я┌я─п╟я┌я▐ п╡я─п╣п╪я▐ п╫п╟ п╬п╤п╦п╢п╟п╫п╦п╣ п╢я─я┐пЁ п╢я─я┐пЁп╟. п÷я─п╦ я─п╟п╠п╬я┌п╣ п╫п╟п╢ п╬п╢п╫п╦п╪п╦ п╦ я┌п╣п╪п╦ п╤п╣ я└п╟п╧п╩п╟п╪п╦ п╬п╨п╟п╥я▀п╡п╟п╣я┌я│я▐, я┤я┌п╬ п╠п╬п╩я▄я┬п╦п╫я│я┌п╡п╬ п©п╟я─п╟п╩п╩п╣п╩я▄п╫п╬ п╡п╫п╬я│п╦п╪я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧ я│п╬п╡я│п╣п╪ п╫п╣ п©п╣я─п╣п╨я─я▀п╡п╟я▌я┌я│я▐; п╨п╬п╫я└п╩п╦п╨я┌я▀ п╠я▀п╡п╟я▌я┌ я─п╣п╢п╨п╬. п≤ п╡я─п╣п╪я▐, п╨п╬я┌п╬я─п╬п╣ п╠я▀п╩п╬ п©п╬я┌я─п╟я┤п╣п╫п╬ п╫п╟ я─п╟п╥я─п╣я┬п╣п╫п╦п╣ п╨п╬п╫я└п╩п╦п╨я┌п╬п╡, п╨п╟п╨ п©я─п╟п╡п╦п╩п╬, п╥п╫п╟я┤п╦я┌п╣п╩я▄п╫п╬ п╪п╣п╫я▄я┬п╣ п╡я─п╣п╪п╣п╫п╦, п╬я┌п╫п╦п╪п╟п╣п╪п╬пЁп╬ п╠п╩п╬п╨п╦я─я┐я▌я┴п╣п╧ я│п╦я│я┌п╣п╪п╬п╧.

п²п╟п╨п╬п╫п╣я├, п╡я│п╣ я│я┘п╬п╢п╦я┌я│я▐ п╨ я┌п╟п╨п╬п╪я┐ п╨я─п╦я┌п╦я┤п╣я│п╨п╬п╪я┐ я└п╟п╨я┌п╬я─я┐ п╨п╟п╨ п╡п╥п╟п╦п╪п╬п╢п╣п╧я│я┌п╡п╦п╣ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╣п╧. п÷я─п╦ п©п╩п╬я┘п╬п╪ п╡п╥п╟п╦п╪п╬п©п╬п╫п╦п╪п╟п╫п╦п╦ я┐п╡п╣п╩п╦я┤п╦п╡п╟п╣я┌я│я▐ п╨п╬п╩п╦я┤п╣я│я┌п╡п╬ п╨п╟п╨ я│п╦п╫я┌п╟п╨я│п╦я┤п╣я│п╨п╦я┘, я┌п╟п╨ п╦ я│п╣п╪п╟п╫я┌п╦я┤п╣я│п╨п╦я┘ п╨п╬п╫я└п╩п╦п╨я┌п╬п╡. п²п╣я┌ я│п╦я│я┌п╣п╪я▀, п╨п╬я┌п╬я─п╟я▐ п╪п╬п╤п╣я┌ п©п╬п╡я▀я│п╦я┌я▄ я┐я─п╬п╡п╣п╫я▄ п╡п╥п╟п╦п╪п╬п©п╬п╫п╦п╪п╟п╫п╦я▐, п╦ п╫п╣я┌ я│п╦я│я┌п╣п╪я▀, п╨п╬я┌п╬я─п╟я▐ п╪п╬п╤п╣я┌ п╬п©я─п╣п╢п╣п╩я▐я┌я▄ я│п╣п╪п╟п╫я┌п╦я┤п╣я│п╨п╦п╣ п╨п╬п╫я└п╩п╦п╨я┌я▀. п²п╣ я│я┌п╬п╦я┌ п╡п╬п╥п╩п╟пЁп╟я┌я▄ п╠п╬п╩я▄я┬п╦п╣ п╫п╟п╢п╣п╤п╢я▀ п╫п╟ я┌п╬, я┤я┌п╬ п╠п╩п╬п╨п╦я─я┐я▌я┴п╟я▐ я│п╦я│я┌п╣п╪п╟ п╩я┐я┤я┬п╣ п╥п╟я┴п╦я┴п╣п╫п╟ п╬я┌ п╨п╬п╫я└п╩п╦п╨я┌п╬п╡; п╫п╟ п©я─п╟п╨я┌п╦п╨п╣ п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦п╣ я│п╫п╦п╤п╟п╣я┌ п©я─п╬п╢я┐п╨я┌п╦п╡п╫п╬я│я┌я▄ п╨п╟п╨ п╫п╦я┤я┌п╬ п╢я─я┐пЁп╬п╣.

п▓ п╨п╫п╦пЁп╣ п╢п╩я▐ п╦п╢п╣п╫я┌п╦я└п╦п╨п╟я├п╦п╦ я└п╟п╧п╩п╬п╡ п╦ п╢п╦я─п╣п╨я┌п╬я─п╦п╧ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ Subversion п©я─п╦п╪п╣п╫я▐я▌я┌я│я▐ URL. п▓ п╬я│п╫п╬п╡п╫п╬п╪, п╡ я█я┌п╦я┘ URL п╦я│п©п╬п╩я▄п╥я┐я▌я┌я│я▐ я│я┌п╟п╫п╢п╟я─я┌п╫я▀п╣ п©я─п╟п╡п╦п╩п╟ п╥п╟п©п╦я│п╦, п©п╬п╥п╡п╬п╩я▐я▌я┴п╦п╣ я┐п╨п╟п╥я▀п╡п╟я┌я▄ п╦п╪я▐ я│п╣я─п╡п╣я─п╟ п╦ п╫п╬п╪п╣я─ п©п╬я─я┌п╟ п╨п╟п╨ я┤п╟я│я┌я▄ URL:

$ svn checkout http://svn.example.com:9834/repos
Б─╕

п·п╢п╫п╟п╨п╬, п╡ п╬п╠я─п╟п╠п╬я┌п╨п╣ URL я│п╦я│я┌п╣п╪п╬п╧ Subversion п╣я│я┌я▄ п╫п╣п╨п╬я┌п╬я─я▀п╣ п╫я▌п╟п╫я│я▀, п╬ п╨п╬я┌п╬я─я▀я┘ п╫я┐п╤п╫п╬ п©п╬п╪п╫п╦я┌я▄. п²п╟п©я─п╦п╪п╣я─, п╡ я│п╬п╬я┌п╡п╣я┌я│я┌п╡п╦п╦ я│ п©я─п╦п╫я▐я┌я▀п╪п╦ я│п╬пЁп╩п╟я┬п╣п╫п╦я▐п╪п╦, URL, п╦я│п©п╬п╩я▄п╥я┐я▌я┴п╦п╧ п╪п╣я┌п╬п╢ п╢п╬я│я┌я┐п©п╟ file: (я█я┌п╬я┌ п╪п╣я┌п╬п╢ п╢п╬я│я┌я┐п©п╟ п╦я│п©п╬п╩я▄п╥я┐п╣я┌я│я▐ п╢п╩я▐ п╩п╬п╨п╟п╩я▄п╫я▀я┘ я┘я─п╟п╫п╦п╩п╦я┴), п╢п╬п╩п╤п╣п╫ п╩п╦п╠п╬ п╡п╨п╩я▌я┤п╟я┌я▄ п╦п╪я▐ я│п╣я─п╡п╣я─п╟ localhost, п╩п╦п╠п╬ п╡п╬п╬п╠я┴п╣ п╫п╣ я│п╬п╢п╣я─п╤п╟я┌я▄ п╦п╪п╣п╫п╦ я│п╣я─п╡п╣я─п╟:

$ svn checkout file:///path/to/repos
Б─╕
$ svn checkout file://localhost/path/to/repos
Б─╕

п я─п╬п╪п╣ я┌п╬пЁп╬, я┌п╣п╪, п╨я┌п╬ п©я─п╦п╪п╣п╫я▐п╣я┌ я│я┘п╣п╪я┐ file: п╫п╟ п©п╩п╟я┌я└п╬я─п╪п╣ Windows, п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╫п╣п╬я└п╦я├п╦п╟п╩я▄п╫я▀п╣ б╚я│я┌п╟п╫п╢п╟я─я┌п╫я▀п╣б╩ п©я─п╟п╡п╦п╩п╟ п╥п╟п©п╦я│п╦ п©я─п╦ п╬п╠я─п╟я┴п╣п╫п╦п╦ п╨ я┘я─п╟п╫п╦п╩п╦я┴я┐, п╨п╬я┌п╬я─п╬п╣ п╫п╟я┘п╬п╢п╦я┌я│я▐ п╫п╟ п╬п╢п╫п╬п╪ п╨п╬п╪п©я▄я▌я┌п╣я─п╣, п╫п╬ п╫п╟ я─п╟п╥п╫я▀я┘ п╢п╦я│п╨п╟я┘ я│ п╨п╩п╦п╣п╫я┌п╬п╪. п·п╠п╣ п©я─п╦п╡п╣п╢п╣п╫п╫я▀п╣ п╫п╦п╤п╣ п╥п╟п©п╦я│п╦ п╠я┐п╢я┐я┌ я─п╟п╠п╬я┌п╟я┌я▄; п╥п╢п╣я│я▄ X Б─■ я█я┌п╬ п╦п╪я▐ п╢п╦я│п╨п╟, п╫п╟ п╨п╬я┌п╬я─п╬п╪ п╫п╟я┘п╬п╢п╦я┌я│я▐ я┘я─п╟п╫п╦п╩п╦я┴п╣:

C:\> svn checkout file:///X:/path/to/repos
Б─╕
C:\> svn checkout "file:///X|/path/to/repos"
Б─╕

п÷я─п╦ п╡я┌п╬я─п╬п╧ я└п╬я─п╪п╣ п╥п╟п©п╦я│п╦ п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ п╡п╣я─я┌п╦п╨п╟п╩я▄п╫п╟я▐ я┤п╣я─я┌п╟ п╫п╣ я─п╟я│я├п╣п╫п╦п╡п╟п╩п╟я│я▄ п╨п╟п╨ п╨п╟п╫п╟п╩, п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п╡п╥я▐я┌я▄ URL п╡ п╨п╟п╡я▀я┤п╨п╦. п╒п╟п╨п╤п╣ п╬п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦п╣ п╡ URL п©я─я▐п╪п╬пЁп╬ я│п╩п╣я┬п╟, п╫п╣я│п╪п╬я┌я─я▐ п╫п╟ я┌п╬, я┤я┌п╬ я─п╬п╢п╫п╟я▐ (п╫п╣-URL) я└п╬я─п╪п╟ п╥п╟п©п╦я│п╦ п©я┐я┌п╦ п╡ Windows п╦я│п©п╬п╩я▄п╥я┐п╣я┌ п╬п╠я─п╟я┌п╫я▀п╧ я│п╩п╣я┬.

п²я┐ п╦ п╫п╟п╨п╬п╫п╣я├, п╫я┐п╤п╫п╬ я│п╨п╟п╥п╟я┌я▄ п╬ я┌п╬п╪, я┤я┌п╬ п╨п╩п╦п╣п╫я┌ Subversion п©я─п╦ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬я│я┌п╦ п╟п╡я┌п╬п╪п╟я┌п╦я┤п╣я│п╨п╦ п╨п╬п╢п╦я─я┐п╣я┌ URL я┌п╬я┤п╫п╬ я┌п╟п╨ п╤п╣, п╨п╟п╨ я█я┌п╬ п╢п╣п╩п╟п╣я┌ п╡п╣п╠-п╠я─п╟я┐п╥п╣я─. п²п╟п©я─п╦п╪п╣я─, п╣я│п╩п╦ URL п╠я┐п╢п╣я┌ я│п╬п╢п╣я─п╤п╟я┌я▄ п©я─п╬п╠п╣п╩ п╦п╩п╦ ASCII-я│п╦п╪п╡п╬п╩я▀ п╡ п╡п╣я─я┘п╫п╣п╪ я─п╣пЁп╦я│я┌я─п╣:

$ svn checkout "http://host/path with space/project/espaц╠a"

Б─╕я┌п╬ Subversion я│п╨я─п╬п╣я┌ п╫п╣п╠п╣п╥п╬п©п╟я│п╫я▀п╣ я│п╦п╪п╡п╬п╩я▀ п╦ п╠я┐п╢п╣я┌ п╡п╣я│я┌п╦ я│п╣п╠я▐ я┌п╟п╨, п╨п╟п╨ п╠я┐п╢я┌п╬ п╡я▀ п╫п╟п©п╣я┤п╟я┌п╟п╩п╦:

$ svn checkout http://host/path%20with%20space/project/espa%C3%B1a

п∙я│п╩п╦ п╡ URL п╣я│я┌я▄ п©я─п╬п╠п╣п╩я▀, п╡п╬п╥я▄п╪п╦я┌п╣ п╣пЁп╬ п╡ п╨п╟п╡я▀я┤п╨п╦, п╦ я┌п╬пЁп╢п╟ п╨п╬п╪п╟п╫п╢п╫п╟я▐ п╬п╠п╬п╩п╬я┤п╨п╟ п╬п╠я─п╟п╠п╬я┌п╟п╣я┌ я█я┌п╬ п╡я│п╣ п╨п╟п╨ п╬п╢п╦п╫ п╟я─пЁя┐п╪п╣п╫я┌ п©я─п╬пЁя─п╟п╪п╪я▀ svn.

п▓я▀ я┐п╤п╣ я┤п╦я┌п╟п╩п╦ п╬ я─п╟п╠п╬я┤п╦я┘ п╨п╬п©п╦я▐я┘; я┌п╣п©п╣я─я▄ п╪я▀ п©п╬п╨п╟п╤п╣п╪ п╨п╟п╨ п╨п╩п╦п╣п╫я┌ Subversion я│п╬п╥п╢п╟п╣я┌ п╦ п╦я│п©п╬п╩я▄п╥я┐п╣я┌ п╦я┘.

п═п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ Subversion п©я─п╣п╢я│я┌п╟п╡п╩я▐п╣я┌ я│п╬п╠п╬п╧ п╬п╠я▀я┤п╫п╬п╣ п╢п╣я─п╣п╡п╬ п╨п╟я┌п╟п╩п╬пЁп╬п╡ п╫п╟ п╡п╟я┬п╣п╪ п╨п╬п╪п©я▄я▌я┌п╣я─п╣, я│п╬п╢п╣я─п╤п╟я┴п╣п╣ п╫п╟п╠п╬я─ я└п╟п╧п╩п╬п╡. п▓я▀ п╪п╬п╤п╣я┌п╣ п©п╬ я│п╡п╬п╣п╪я┐ я┐я│п╪п╬я┌я─п╣п╫п╦я▌ я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟я┌я▄ я█я┌п╦ я└п╟п╧п╩я▀ п╦, п╣я│п╩п╦ я█я┌п╬ п╦я│я┘п╬п╢п╫я▀п╣ п╨п╬п╢я▀, п╡я▀ п╪п╬п╤п╣я┌п╣ п╬п╠я▀я┤п╫я▀п╪ я│п©п╬я│п╬п╠п╬п╪ я│п╨п╬п╪п©п╦п╩п╦я─п╬п╡п╟я┌я▄ п╦п╥ п╫п╦я┘ п©я─п╬пЁя─п╟п╪п╪я┐. п▓п╟я┬п╟ я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ Б─■ я█я┌п╬ п╡п╟я┬п╣ п╩п╦я┤п╫п╬п╣ я─п╟п╠п╬я┤п╣п╣ п©я─п╬я│я┌я─п╟п╫я│я┌п╡п╬. Subversion п╨п╟п╨ п╫п╣ я│п╪п╣я┬п╦п╡п╟п╣я┌ я│ п╡п╟я┬п╦п╪п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╡п╫п╬я│п╦п╪я▀п╣ п╢я─я┐пЁп╦п╪п╦, я┌п╟п╨ п╦ п╫п╣ п╢п╣п╩п╟п╣я┌ п╢п╬я│я┌я┐п©п╫я▀п╪п╦ п╢п╩я▐ п╢я─я┐пЁп╦я┘ п╦п╥п╪п╣п╫п╣п╫п╦я▐, я│п╢п╣п╩п╟п╫п╫я▀п╣ п╡п╟п╪п╦, п©п╬п╨п╟ п╡я▀ я│п╟п╪п╦ п╫п╣ п©я─п╦п╨п╟п╤п╣я┌п╣ я│п╢п╣п╩п╟я┌я▄ я█я┌п╬. п▓я▀ п╢п╟п╤п╣ п╪п╬п╤п╣я┌п╣ п╦п╪п╣я┌я▄ п╫п╣я│п╨п╬п╩я▄п╨п╬ я─п╟п╠п╬я┤п╦я┘ п╨п╬п©п╦п╧ п╬п╢п╫п╬пЁп╬ п╦ я┌п╬пЁп╬ п╤п╣ п©я─п╬п╣п╨я┌п╟.

п÷п╬я│п╩п╣ я┌п╬пЁп╬, п╨п╟п╨ п╡я▀ п╡п╫п╣я│п╩п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я└п╟п╧п╩я▀ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╦ я┐п╠п╣п╢п╦п╩п╦я│я▄ п╡ я┌п╬п╪, я┤я┌п╬ п╬п╫п╦ п╨п╬я─я─п╣п╨я┌п╫п╬ я─п╟п╠п╬я┌п╟я▌я┌, Subversion п©я─п╣п╢п╩п╟пЁп╟п╣я┌ п╡п╟п╪ п╨п╬п╪п╟п╫п╢я▀ б╚п©я┐п╠п╩п╦п╨п╟я├п╦п╦б╩ (п╥п╟п©п╦я│п╦ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣) п╡п╟я┬п╦я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧, п╡ я─п╣п╥я┐п╩я▄я┌п╟я┌п╣ я┤п╣пЁп╬ п╬п╫п╦ я│я┌п╟п╫я┐я┌ п╢п╬я│я┌я┐п©п╫я▀п╪п╦ п╢п╩я▐ п╡я│п╣я┘ я┐я┤п╟я│я┌п╫п╦п╨п╬п╡ п©я─п╬п╣п╨я┌п╟. п∙я│п╩п╦ п╢я─я┐пЁп╦п╣ я┐я┤п╟я│я┌п╫п╦п╨п╦ п©я─п╬п╣п╨я┌п╟ п╬п©я┐п╠п╩п╦п╨п╬п╡п╟п╩п╦ я│п╡п╬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐, Subversion п©я─п╣п╢п╩п╟пЁп╟п╣я┌ п╡п╟п╪ п╨п╬п╪п╟п╫п╢я▀ п╢п╩я▐ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦я▐ (п©я┐я┌п╣п╪ я┤я┌п╣п╫п╦я▐ п╦п╫я└п╬я─п╪п╟я├п╦п╦ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟) я█я┌п╦я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧ я│ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╣п╧.

п═п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ я│п╬п╢п╣я─п╤п╦я┌ п╫п╣я│п╨п╬п╩я▄п╨п╬ п╢п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫я▀я┘ я└п╟п╧п╩п╬п╡, я│п╬п╥п╢п╟п╫п╫я▀я┘ п╦ п╬п╠я│п╩я┐п╤п╦п╡п╟п╣п╪я▀я┘ Subversion, п╨п╬я┌п╬я─я▀п╣ п©п╬п╪п╬пЁп╟я▌я┌ п╣п╧ п©я─п╦ п╡я▀п©п╬п╩п╫п╣п╫п╦п╦ я█я┌п╦я┘ п╨п╬п╪п╟п╫п╢. п▓ я┤п╟я│я┌п╫п╬я│я┌п╦, п╨п╟п╤п╢я▀п╧ п╨п╟я┌п╟п╩п╬пЁ п╡ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ я│п╬п╢п╣я─п╤п╦я┌ п©п╬п╢п╨п╟я┌п╟п╩п╬пЁ я│ п╦п╪п╣п╫п╣п╪ .svn п╨п╬я┌п╬я─я▀п╧ п╫п╟п╥я▀п╡п╟п╣я┌я│я▐ я│п╩я┐п╤п╣п╠п╫я▀п╪ п╨п╟я┌п╟п╩п╬пЁп╬п╪ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦. п╓п╟п╧п╩я▀ п╡ я│п╩я┐п╤п╣п╠п╫п╬п╪ п╨п╟я┌п╟п╩п╬пЁп╣ п©п╬п╪п╬пЁп╟я▌я┌ Subversion п╬п©я─п╣п╢п╣п╩п╦я┌я▄ п╨п╟п╨п╦п╣ я└п╟п╧п╩я▀ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ я│п╬п╢п╣я─п╤п╟я┌ п╫п╣п╬п©я┐п╠п╩п╦п╨п╬п╡п╟п╫п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╦ п╨п╟п╨п╦п╣ я└п╟п╧п╩я▀ я┐я│я┌п╟я─п╣п╩п╦ п©п╬ п╬я┌п╫п╬я┬п╣п╫п╦я▌ п╨ я└п╟п╧п╩п╟п╪ п╢я─я┐пЁп╦я┘ я┐я┤п╟я│я┌п╫п╦п╨п╬п╡.

п п╟п╨ п©я─п╟п╡п╦п╩п╬, я┘я─п╟п╫п╦п╩п╦я┴п╣ Subversion я│п╬п╢п╣я─п╤п╦я┌ я└п╟п╧п╩я▀ (п╦п╩п╦ п╦я│я┘п╬п╢п╫я▀п╧ п╨п╬п╢) п╫п╣я│п╨п╬п╩я▄п╨п╦я┘ п©я─п╬п╣п╨я┌п╬п╡; п╬п╠я▀я┤п╫п╬ п╨п╟п╤п╢я▀п╧ п©я─п╬п╣п╨я┌ п©я─п╣п╢я│я┌п╟п╡п╩я▐п╣я┌я│я▐ п╡ п╡п╦п╢п╣ п©п╬п╢п╨п╟я┌п╟п╩п╬пЁп╟ я└п╟п╧п╩п╬п╡п╬п╧ я│п╦я│я┌п╣п╪я▀ я┘я─п╟п╫п╦п╩п╦я┴п╟. п÷я─п╦ я┌п╟п╨п╬п╪ п©п╬п╢я┘п╬п╢п╣, п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄я│п╨п╟я▐ я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ п╬п╠я▀я┤п╫п╬ я│п╬п╬я┌п╡п╣я┌я│я┌п╡я┐п╣я┌ п╬я┌п╢п╣п╩я▄п╫п╬п╪я┐ п©п╬п╢п╨п╟я┌п╟п╩п╬пЁя┐ я┘я─п╟п╫п╦п╩п╦я┴п╟.

п²п╟п©я─п╦п╪п╣я─, п©я─п╣п╢п©п╬п╩п╬п╤п╦п╪, я┤я┌п╬ я┐ п╡п╟я│ п╣я│я┌я▄ я┘я─п╟п╫п╦п╩п╦я┴п╣, я│п╬п╢п╣я─п╤п╟я┴п╣п╣ п╢п╡п╟ п©я─п╬пЁя─п╟п╪п╪п╫я▀я┘ п©я─п╬п╣п╨я┌п╟: paint п╦ calc. п п╟п╤п╢я▀п╧ п©я─п╬п╣п╨я┌ я─п╟я│п©п╬п╩п╟пЁп╟п╣я┌я│я▐ п╡ я│п╡п╬п╣п╪ я│п╬п╠я│я┌п╡п╣п╫п╫п╬п╪ п╨п╟я┌п╟п╩п╬пЁп╣ п╨п╟п╨ п©п╬п╨п╟п╥п╟п╫п╬ п╫п╟ п═п╦я│я┐п╫п╬п╨б═1.6, б╚п╓п╟п╧п╩п╬п╡п╟я▐ я│п╦я│я┌п╣п╪п╟ я┘я─п╟п╫п╦п╩п╦я┴п╟б╩.

п═п╦я│я┐п╫п╬п╨ 1.6. п╓п╟п╧п╩п╬п╡п╟я▐ я│п╦я│я┌п╣п╪п╟ я┘я─п╟п╫п╦п╩п╦я┴п╟

п■п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ я│п╬п╥п╢п╟я┌я▄ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п╡п╟п╪ п╫я┐п╤п╫п╬ п©п╬п╩я┐я┤п╦я┌я▄ п╨п╟п╨п╬п╧-п╩п╦п╠п╬ п╦п╥ п©п╬п╢п╨п╟я┌п╟п╩п╬пЁп╬п╡ я┘я─п╟п╫п╦п╩п╦я┴п╟. (п▓п╬п╥п╪п╬п╤п╫п╬, я┌п╣я─п╪п╦п╫ п©п╬п╩я┐я┤п╦я┌я▄ п╥п╡я┐я┤п╦я┌ п╨п╟п╨ я┤я┌п╬-я┌п╬, я│п╡я▐п╥п╟п╫п╫п╬п╣ я│ п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦п╣п╪ п╦п╩п╦ я─п╣п╥п╣я─п╡п╦я─п╬п╡п╟п╫п╦п╣п╪ я─п╣я│я┐я─я│п╬п╡, п╫п╬ я█я┌п╬ п╫п╣ я┌п╟п╨; п╢п╟п╫п╫п╟я▐ п╨п╬п╪п╟п╫п╢п╟ п©я─п╬я│я┌п╬ я│п╬п╥п╢п╟п╣я┌ п╢п╩я▐ п╡п╟я│ п╩п╦я┤п╫я┐я▌ п╨п╬п©п╦я▌ п©я─п╬п╣п╨я┌п╟.) п²п╟п©я─п╦п╪п╣я─, п╣я│п╩п╦ п╡я▀ п©п╬п╩я┐я┤п╦я┌п╣ /calc, я┐ п╡п╟я│ п╠я┐п╢п╣я┌ я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ п╫п╟п©п╬п╢п╬п╠п╦п╣ я█я┌п╬п╧:

$ svn checkout http://svn.example.com/repos/calc
A    calc/Makefile
A    calc/integer.c
A    calc/button.c
Checked out revision 56.

$ ls -A calc
Makefile  integer.c  button.c  .svn/

п▒я┐п╨п╡я▀ п░ пЁп╬п╡п╬я─я▐я┌ п╬ я┌п╬п╪, я┤я┌п╬ Subversion п╢п╬п╠п╟п╡п╦п╩ я█я┌п╬я┌ я█п╩п╣п╪п╣п╫я┌ п╡ п╡п╟я┬я┐ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌. п╒п╣п©п╣я─я▄ я┐ п╡п╟я│ п╣я│я┌я▄ п╩п╦я┤п╫п╟я▐ п╨п╬п©п╦я▐ п╨п╟я┌п╟п╩п╬пЁп╟ /calc я┘я─п╟п╫п╦п╩п╦я┴п╟, я│ п╬п╢п╫п╦п╪ п╫п╣п╠п╬п╩я▄я┬п╦п╪ п╢п╬п╠п╟п╡п╩п╣п╫п╦п╣п╪ Б─■ п╨п╟я┌п╟п╩п╬пЁп╬п╪ .svn, я│п╬п╢п╣я─п╤п╟я┴п╦п╪, п╨п╟п╨ п╠я▀п╩п╬ я┐п╨п╟п╥п╟п╫п╬ п╡я▀я┬п╣, п╢п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫я┐я▌ п╦п╫я└п╬я─п╪п╟я├п╦я▌, п╫п╣п╬п╠я┘п╬п╢п╦п╪я┐я▌ Subversion.

п÷я─п╣п╢п©п╬п╩п╬п╤п╦п╪, п╡я▀ п╡п╫п╣я│п╩п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ button.c. п╒п╟п╨ п╨п╟п╨ п╨п╟я┌п╟п╩п╬пЁ .svn п©п╬п╪п╫п╦я┌ п╢п╟я┌я┐ п╦п╥п╪п╣п╫п╣п╫п╦я▐ я└п╟п╧п╩п╟ п╦ п╣пЁп╬ п╬я─п╦пЁп╦п╫п╟п╩я▄п╫п╬п╣ я│п╬п╢п╣я─п╤п╦п╪п╬п╣, Subversion п╪п╬п╤п╣я┌ я│п╨п╟п╥п╟я┌я▄ п╬ я┌п╬п╪, я┤я┌п╬ п╡я▀ п╦п╥п╪п╣п╫п╦п╩п╦ я└п╟п╧п╩. Subversion п╫п╣ п©я┐п╠п╩п╦п╨я┐п╣я┌ п╡п╟я┬п╦я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧, п©п╬п╨п╟ п╡я▀ п╫п╣ п©я─п╦п╨п╟п╤п╣я┌п╣ я█я┌п╬ я│п╢п╣п╩п╟я┌я▄. п÷я┐п╠п╩п╦п╨п╟я├п╦я▐ п╡п╟я┬п╦я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╠п╬п╩п╣п╣ п╦п╥п╡п╣я│я┌п╫п╟ п╨п╟п╨ я└п╦п╨я│п╟я├п╦я▐ (п╦п╩п╦ checking in) п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣.

п■п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ п╬п©я┐п╠п╩п╦п╨п╬п╡п╟я┌я▄ п╡п╟я┬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╡я▀ п╪п╬п╤п╣я┌п╣ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ п╨п╬п╪п╟п╫п╢п╬п╧ commit.

$ svn commit button.c -m "Fixed a typo in button.c."
Sending        button.c
Transmitting file data .
Committed revision 57.

п╒п╣п©п╣я─я▄ п╡п╟я┬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ button.c, п╡п╪п╣я│я┌п╣ я│ п©я─п╦п╪п╣я┤п╟п╫п╦п╣п╪, п╬п©п╦я│я▀п╡п╟я▌я┴п╦п╪ я█я┌п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ (п╟ п╦п╪п╣п╫п╫п╬: п╦я│п©я─п╟п╡п╩п╣п╫п╦п╣ п╬п©п╣я┤п╟я┌п╨п╦), п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟п╫я▀ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣; п╣я│п╩п╦ п╢я─я┐пЁп╬п╧ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄ я│п╬п╥п╢п╟я│я┌ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ /calc, п╬п╫ я┐п╡п╦п╢п╦я┌ п╡п╟я┬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ п©п╬я│п╩п╣п╢п╫п╣п╧ п╡п╣я─я│п╦п╦ я└п╟п╧п╩п╟.

п÷я─п╣п╢п©п╬п╩п╬п╤п╦п╪, я┐ п╡п╟я│ п╣я│я┌я▄ п©п╟я─я┌п╫п╣я─, п║п╟п╩п╩п╦, п╨п╬я┌п╬я─п╟я▐ я│п╬п╥п╢п╟п╩п╟ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ /calc п╬п╢п╫п╬п╡я─п╣п╪п╣п╫п╫п╬ я│ п╡п╟п╪п╦. п п╬пЁп╢п╟ п╡я▀ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟п╩п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ button.c, я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ п║п╟п╩п╩п╦ п╬я│я┌п╟п╩п╟я│я▄ п╫п╣п╦п╥п╪п╣п╫п╣п╫п╫п╬п╧, я┌п╟п╨ п╨п╟п╨ Subversion п╪п╬п╢п╦я└п╦я├п╦я─я┐п╣я┌ я─п╟п╠п╬я┤п╦п╣ п╨п╬п©п╦п╦ я┌п╬п╩я▄п╨п╬ п©п╬ п╥п╟п©я─п╬я│я┐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╣п╧.

п■п╩я▐ п©я─п╦п╡п╣п╢п╣п╫п╦я▐ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╡ п╟п╨я┌я┐п╟п╩я▄п╫п╬п╣ я│п╬я│я┌п╬я▐п╫п╦п╣ п║п╟п╩п╩п╦ п╪п╬п╤п╣я┌ п©п╬п©я─п╬я│п╦я┌я▄ Subversion п╬п╠п╫п╬п╡п╦я┌я▄ п╣я▒ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п╦я│п©п╬п╩я▄п╥я┐я▐ п╨п╬п╪п╟п╫п╢я┐ Subversion update. п╜я┌п╬ п╡п╨п╩я▌я┤п╦я┌ п╡п╟я┬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ п╣п╣ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, я┌п╟п╨ п╤п╣ п╨п╟п╨ п╦ п╡я│п╣ п╢я─я┐пЁп╦п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟п╫п╫я▀п╣ п©п╬я│п╩п╣ я┌п╬пЁп╬, п╨п╟п╨ п╬п╫п╟ я│п╬п╥п╢п╟п╡п╟п╩п╟ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌.

$ pwd
/home/sally/calc

$ ls -A
.svn/ Makefile integer.c button.c

$ svn update
U    button.c
Updated to revision 57.

п▓я▀п╡п╬п╢ п╨п╬п╪п╟п╫п╢я▀ svn update пЁп╬п╡п╬я─п╦я┌, я┤я┌п╬ Subversion п╬п╠п╫п╬п╡п╦п╩п╟ я│п╬п╢п╣я─п╤п╦п╪п╬п╣ button.c. п·п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣, я┤я┌п╬ п║п╟п╩п╩п╦ п╫п╣ п╢п╬п╩п╤п╫п╟ я┐п╨п╟п╥я▀п╡п╟я┌я▄, п╨п╟п╨п╬п╧ я└п╟п╧п╩ п╬п╠п╫п╬п╡п╦я┌я▄; п╢п╩я▐ п╬п©я─п╣п╢п╣п╩п╣п╫п╦я▐ я└п╟п╧п╩п╬п╡, п╨п╬я┌п╬я─я▀п╣ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п©я─п╦п╡п╣я│я┌п╦ п╡ п╟п╨я┌я┐п╟п╩я▄п╫п╬п╣ я│п╬я│я┌п╬я▐п╫п╦п╣, Subversion п╦я│п©п╬п╩я▄п╥я┐п╣я┌ п╦п╫я└п╬я─п╪п╟я├п╦я▌ п╡ п╨п╟я┌п╟п╩п╬пЁп╣ .svn, п╟ я┌п╟п╨п╤п╣ п╦п╫я└п╬я─п╪п╟я├п╦я▌ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟.

п·п©п╣я─п╟я├п╦я▐ svn commit п©я┐п╠п╩п╦п╨я┐п╣я┌ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╩я▌п╠п╬пЁп╬ п╨п╬п╩п╦я┤п╣я│я┌п╡п╟ я└п╟п╧п╩п╬п╡ п╦ п╨п╟я┌п╟п╩п╬пЁп╬п╡ п╥п╟ п╬п╢п╫я┐ п╟я┌п╬п╪п╟я─п╫я┐я▌ п╬п©п╣я─п╟я├п╦я▌. п▓ я│п╡п╬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╡я▀ п╪п╬п╤п╣я┌п╣ п╪п╣п╫я▐я┌я▄ я│п╬п╢п╣я─п╤п╦п╪п╬п╣ я└п╟п╧п╩п╬п╡, я│п╬п╥п╢п╟п╡п╟я┌я▄, я┐п╢п╟п╩я▐я┌я▄, п©п╣я─п╣п╦п╪п╣п╫п╬п╡я▀п╡п╟я┌я▄ п╦ п╨п╬п©п╦я─п╬п╡п╟я┌я▄ я└п╟п╧п╩я▀ п╦ п╨п╟я┌п╟п╩п╬пЁп╦, п╟ п╥п╟я┌п╣п╪ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟я┌я▄ п╡я│п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╥п╟ п╬п╢п╫я┐ п╟я┌п╬п╪п╟я─п╫я┐я▌ я┌я─п╟п╫п╥п╟п╨я├п╦я▌.

п÷п╬п╢ б╚п╟я┌п╬п╪п╟я─п╫п╬п╧ я┌я─п╟п╫п╥п╟п╨я├п╦п╣п╧б╩ п©п╬п╫п╦п╪п╟п╣я┌я│я▐ я│п╩п╣п╢я┐я▌я┴п╣п╣: п╩п╦п╠п╬ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ п╡п╫п╬я│я▐я┌я│я▐ п╡я│п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п©п╬п╩п╫п╬я│я┌я▄я▌, п╩п╦п╠п╬ п╬п╫п╦ п╫п╣ п╡п╫п╬я│я▐я┌я│я▐ п╡п╬п╬п╠я┴п╣. Subversion п╡п╣п╢я▒я┌ я│п╣п╠я▐ я┌п╟п╨, п©я─п╦п╫п╦п╪п╟я▐ п╡ я─п╟я│я┤п╣я┌ п╡п╬п╥п╪п╬п╤п╫я▀п╣ п©я─п╬пЁя─п╟п╪п╪п╫я▀п╣ я│п╠п╬п╦, я│п╦я│я┌п╣п╪п╫я▀п╣ я│п╠п╬п╦, п©я─п╬п╠п╩п╣п╪я▀ я│ я│п╣я┌я▄я▌, п╟ я┌п╟п╨п╤п╣ п╫п╣п╡п╣я─п╫я▀п╣ п╢п╣п╧я│я┌п╡п╦я▐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐.

п п╟п╤п╢я▀п╧ я─п╟п╥, п╨п╬пЁп╢п╟ п©я─п╬п╦я│я┘п╬п╢п╦я┌ я└п╦п╨я│п╟я├п╦я▐, я│п╬п╥п╢п╟я▒я┌я│я▐ п╫п╬п╡п╬п╣ я│п╬я│я┌п╬я▐п╫п╦п╣ я└п╟п╧п╩п╬п╡п╬п╧ я│п╦я│я┌п╣п╪я▀, п╨п╬я┌п╬я─п╬п╣ п╫п╟п╥я▀п╡п╟п╣я┌я│я▐ п©я─п╟п╡п╨п╬п╧. п п╟п╤п╢п╟я▐ п©я─п╟п╡п╨п╟ п©п╬п╩я┐я┤п╟п╣я┌ я┐п╫п╦п╨п╟п╩я▄п╫я▀п╧ п╫п╬п╪п╣я─, п╫п╟ п╣п╢п╦п╫п╦я├я┐ п╠п╬п╩я▄я┬п╦п╧ п╫п╬п╪п╣я─п╟ п©я─п╣п╢я▀п╢я┐я┴п╣п╧ п©я─п╟п╡п╨п╦. п²п╟я┤п╟п╩я▄п╫п╟я▐ п©я─п╟п╡п╨п╟ я┌п╬п╩я▄п╨п╬ я┤я┌п╬ я│п╬п╥п╢п╟п╫п╫п╬пЁп╬ я┘я─п╟п╫п╦п╩п╦я┴п╟ п©п╬п╩я┐я┤п╟п╣я┌ п╫п╬п╪п╣я─ 0 п╦ п╫п╣ я│п╬п╢п╣я─п╤п╦я┌ п╫п╦я┤п╣пЁп╬, п╨я─п╬п╪п╣ п©я┐я│я┌п╬пЁп╬ п╨п╬я─п╫п╣п╡п╬пЁп╬ п╨п╟я┌п╟п╩п╬пЁп╟.

п═п╦я│я┐п╫п╬п╨б═1.7, б╚п╔я─п╟п╫п╦п╩п╦я┴п╣б╩ п╬я┌п╩п╦я┤п╫п╬ п╦п╩п╩я▌я│я┌я─п╦я─я┐п╣я┌ я┘я─п╟п╫п╦п╩п╦я┴п╣. п÷я─п╣п╢я│я┌п╟п╡я▄я┌п╣ п╪п╟я│я│п╦п╡ п╫п╬п╪п╣я─п╬п╡ п©я─п╟п╡п╬п╨, п╫п╟я┤п╦п╫п╟я▌я┴п╦п╧я│я▐ я│ 0, я│ п╫п╟п©я─п╟п╡п╩п╣п╫п╦п╣п╪ я│п╩п╣п╡п╟ п╫п╟п©я─п╟п╡п╬. п п╟п╤п╢я▀п╧ п╫п╬п╪п╣я─ п©я─п╟п╡п╨п╦ п╦п╪п╣п╣я┌ я│п╬п╬я┌п╡п╣я┌я│я┌п╡я┐я▌я┴п╣п╣ п╢п╣я─п╣п╡п╬ я└п╟п╧п╩п╬п╡, п╟ п╨п╟п╤п╢п╬п╣ п╢п╣я─п╣п╡п╬ п©я─п╣п╢я│я┌п╟п╡п╩я▐п╣я┌ я│п╬п╠п╬п╧ б╚я│п╫п╦п╪п╬п╨б╩ я┌п╬пЁп╬, п╨п╟п╨ я┘я─п╟п╫п╦п╩п╦я┴п╣ п╡я▀пЁп╩я▐п╢п╣п╩п╬ п©п╬я│п╩п╣ я└п╦п╨я│п╟я├п╦п╦.

п═п╦я│я┐п╫п╬п╨ 1.7. п╔я─п╟п╫п╦п╩п╦я┴п╣

п▓п╟п╤п╫п╬ п©п╬п╪п╫п╦я┌я▄, я┤я┌п╬ я─п╟п╠п╬я┤п╦п╣ п╨п╬п©п╦п╦ п╫п╣ п╡я│п╣пЁп╢п╟ я│п╬п╬я┌п╡п╣я┌я│я┌п╡я┐я▌я┌ п╨п╟п╨п╬п╧-я┌п╬ п╬п╢п╫п╬п╧ п©я─п╟п╡п╨п╣ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣; п╬п╫п╦ п╪п╬пЁя┐я┌ я│п╬п╢п╣я─п╤п╟я┌я▄ я└п╟п╧п╩я▀ п╦п╥ я─п╟п╥п╫я▀я┘ п©я─п╟п╡п╬п╨. п²п╟п©я─п╦п╪п╣я─, п╡я▀ п©п╬п╩я┐я┤п╦п╩п╦ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟, я┐ п╨п╬я┌п╬я─п╬пЁп╬ я│п╟п╪п╟я▐ п©п╬я│п╩п╣п╢п╫я▐я▐ п©я─п╟п╡п╨п╟ Б─■ 4:

calc/Makefile:4
     integer.c:4
     button.c:4

п²п╟ п╢п╟п╫п╫я▀п╧ п╪п╬п╪п╣п╫я┌ я─п╟п╠п╬я┤п╦п╧ п╨п╟я┌п╟п╩п╬пЁ п©п╬п╩п╫п╬я│я┌я▄я▌ я│п╬п╬я┌п╡п╣я┌я│я┌п╡я┐п╣я┌ п©я─п╟п╡п╨п╣ 4 п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣. п■п╬п©я┐я│я┌п╦п╪, я┤я┌п╬ п╡я▀ п╡п╫п╣я│п╩п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ button.c п╦ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟п╩п╦ я█я┌п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐. п÷я─п╦ п╬я┌я│я┐я┌я│я┌п╡п╦п╦ п╢я─я┐пЁп╦я┘ я└п╦п╨я│п╟я├п╦п╧ п╡п╟я┬п╟ я└п╦п╨я│п╟я├п╦я▐ я│п╬п╥п╢п╟я│я┌ п©я─п╟п╡п╨я┐ п©п╬п╢ п╫п╬п╪п╣я─п╬п╪ 5, п╦ я┌п╣п©п╣я─я▄ п╡п╟я┬п╟ я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ п╡я▀пЁп╩я▐п╢п╦я┌ я│п╩п╣п╢я┐я▌я┴п╦п╪ п╬п╠я─п╟п╥п╬п╪:

calc/Makefile:4
     integer.c:4
     button.c:5

п÷я─п╣п╢п©п╬п╩п╬п╤п╦п╪, я┤я┌п╬ п©п╬я│п╩п╣ я█я┌п╬пЁп╬ п║п╟п╩п╩п╦ я└п╦п╨я│п╦я─я┐п╣я┌ п╦п╥п╪п╣п╫п╣п╫п╦я▐ integer.c, я│п╬п╥п╢п╟п╡п╟я▐ п©я─п╟п╡п╨я┐ 6. п∙я│п╩п╦ п╡я▀ п╡п╬я│п©п╬п╩я▄п╥я┐п╣я┌п╣я│я▄ svn update п╢п╩я▐ п©я─п╦п╡п╣п╢п╣п╫п╦я▐ я│п╡п╬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╡ п╟п╨я┌я┐п╟п╩я▄п╫п╬п╣ я│п╬я│я┌п╬я▐п╫п╦п╣, я┌п╬ п╬п╫п╟ я│я┌п╟п╫п╣я┌ п╡я▀пЁп╩я▐п╢п╣я┌я▄ я┌п╟п╨:

calc/Makefile:6
     integer.c:6
     button.c:6

п≤п╥п╪п╣п╫п╣п╫п╦я▐, п╡п╫п╣я│п╣п╫п╫я▀п╣ п║п╟п╩п╩п╦ п╡ integer.c п╠я┐п╢я┐я┌ п╬я┌я─п╟п╤п╣п╫я▀ п╡ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, п╦ п╡п╟я┬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ button.c я┌п╟п╨п╤п╣ п╠я┐п╢я┐я┌ п©я─п╦я│я┐я┌я│я┌п╡п╬п╡п╟я┌я▄. п▓ я█я┌п╬п╪ п©я─п╦п╪п╣я─п╣ я┌п╣п╨я│я┌ Makefile п╡ п©я─п╟п╡п╨п╟я┘ 4, 5 п╦ 6 п╦п╢п╣п╫я┌п╦я┤п╣п╫, п╬п╢п╫п╟п╨п╬ Subversion п©я─п╬я│я┌п╟п╡п╩я▐п╣я┌ п╫п╬п╪п╣я─ п©я─п╟п╡п╨п╦ 6 п╢п╩я▐ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ Makefile, я┤я┌п╬п╠я▀ п©п╬п╨п╟п╥п╟я┌я▄ я┤я┌п╬ я└п╟п╧п╩ п╫п╣ я┐я│я┌п╟я─п╣п╩. п╒п╟п╨п╦п╪ п╬п╠я─п╟п╥п╬п╪, п©п╬я│п╩п╣ я┌п╬пЁп╬ п╨п╟п╨ п╡я▀ п╡я▀п©п╬п╩п╫п╦я┌п╣ п©п╬п╩п╫п╬п╣ п╬п╠п╫п╬п╡п╩п╣п╫п╦п╣ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, п╬п╫п╟ п╠я┐п╢п╣я┌ п©п╬п╩п╫п╬я│я┌я▄я▌ я│п╬п╬я┌п╡п╣я┌я│я┌п╡п╬п╡п╟я┌я▄ я┌п╣п╨я┐я┴п╣п╪я┐ я│п╬я│я┌п╬я▐п╫п╦я▌ я┘я─п╟п╫п╦п╩п╦я┴п╟.

п▓ я│п╩я┐п╤п╣п╠п╫п╬п╪ п╨п╟я┌п╟п╩п╬пЁп╣ .svn/ п╢п╩я▐ п╨п╟п╤п╢п╬пЁп╬ я└п╟п╧п╩п╟ я─п╟п╠п╬я┤п╣пЁп╬ п╨п╟я┌п╟п╩п╬пЁп╟ Subversion п╥п╟п©п╦я│я▀п╡п╟п╣я┌ п╦п╫я└п╬я─п╪п╟я├п╦я▌ п╬ п╢п╡я┐я┘ п╡п╟п╤п╫п╣п╧я┬п╦я┘ я│п╡п╬п╧я│я┌п╡п╟я┘:

п≤я│п©п╬п╩я▄п╥я┐я▐ я█я┌я┐ п╦п╫я└п╬я─п╪п╟я├п╦я▌ п©я─п╦ я│п╬п╣п╢п╦п╫п╣п╫п╦п╦ я│ я┘я─п╟п╫п╦п╩п╦я┴п╣п╪, Subversion п╪п╬п╤п╣я┌ я│п╨п╟п╥п╟я┌я▄, п╡ п╨п╟п╨п╬п╪ п╦п╥ я│п╩п╣п╢я┐я▌я┴п╦я┘ я┤п╣я┌я▀я─п╣я┘ я│п╬я│я┌п╬я▐п╫п╦п╧ п╫п╟я┘п╬п╢п╦я┌я│я▐ я─п╟п╠п╬я┤п╦п╧ я└п╟п╧п╩:

п°п╬п╤п╣я┌ п©п╬п╨п╟п╥п╟я┌я▄я│я▐, я┤я┌п╬ я│п╩п╣п╢п╦я┌я▄ п╥п╟ п╟п╨я┌я┐п╟п╩я▄п╫я▀п╪ я│п╬я│я┌п╬я▐п╫п╦п╣п╪ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ я│п╩п╬п╤п╫п╬. п╜я┌п╬ п╫п╣ я┌п╟п╨. п■п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ я┐п╥п╫п╟я┌я▄ я│п╬я│я┌п╬я▐п╫п╦п╣ п╩я▌п╠п╬пЁп╬ я█п╩п╣п╪п╣п╫я┌п╟ п╡ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, я│я┐я┴п╣я│я┌п╡я┐п╣я┌ п╨п╬п╪п╟п╫п╢п╟ svn status. п≈п╟ п╠п╬п╩п╣п╣ п©п╬п╢я─п╬п╠п╫п╬п╧ п╦п╫я└п╬я─п╪п╟я├п╦п╣п╧ п╬п╠ я█я┌п╬п╧ п╨п╬п╪п╟п╫п╢п╣ п╬п╠я─п╟я┌п╦я┌п╣я│я▄ п╨ б╚svn statusб╩.

Subversion я│я┌п╟я─п╟п╣я┌я│я▐ п╠я▀я┌я▄ пЁп╦п╠п╨п╬п╧ п╫п╟я│я┌п╬п╩я▄п╨п╬, п╫п╟я│п╨п╬п╩я▄п╨п╬ я█я┌п╬ п╡п╬п╥п╪п╬п╤п╫п╬. п²п╟п©я─п╦п╪п╣я─, я│я┐я┴п╣я│я┌п╡я┐п╣я┌ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п╦п╪п╣я┌я▄ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, я│п╬п╢п╣я─п╤п╟я┴я┐я▌ я└п╟п╧п╩я▀ п╦ п╨п╟я┌п╟п╩п╬пЁп╦, п╦п╪п╣я▌я┴п╦п╣ я│п╪п╣я┬п╟п╫п╫я▀п╣ п╫п╬п╪п╣я─п╟ я─п╟п╠п╬я┤п╦я┘ п©я─п╟п╡п╬п╨. п²п╬, п╨ я│п╬п╤п╟п╩п╣п╫п╦я▌, я█я┌п╟ пЁп╦п╠п╨п╬я│я┌я▄ п╦п╫п╬пЁп╢п╟ я│п╪я┐я┴п╟п╣я┌ п╫п╣п╨п╬я┌п╬я─я▀я┘ п╫п╬п╡я▀я┘ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╣п╧. п∙я│п╩п╦ я─п╟п╫я▄я┬п╣ п©я─п╦п╪п╣я─я▀, п©п╬п╨п╟п╥я▀п╡п╟я▌я┴п╦п╣ я│п╪п╣я┬п╟п╫п╫я▀п╣ п©я─п╟п╡п╨п╦, п╡я▀п╥я▀п╡п╟п╩п╦ я┐ п╡п╟я│ я┤я┐п╡я│я┌п╡п╬ я─п╟я│я┌п╣я─я▐п╫п╫п╬я│я┌п╦, я┌п╬ я█я┌п╬ я─я┐п╨п╬п╡п╬п╢я│я┌п╡п╬, п╨п╬я┌п╬я─п╬п╣ я─п╟я│я│п╨п╟п╥я▀п╡п╟п╣я┌, п╢п╩я▐ я┤п╣пЁп╬ я┌п╟п╨п╟я▐ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ я│я┐я┴п╣я│я┌п╡я┐п╣я┌ п╦ п╨п╟п╨ п╣п╣ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄, п©я─п╣п╢п╫п╟п╥п╫п╟я┤п╣п╫п╟ п╢п╩я▐ п╡п╟я│.

п÷я─п╦ п╨п╬п╪п╟п╫п╢п╫п╬п╧ я─п╟п╠п╬я┌п╣ п╫п╟п╢ п©я─п╬п╣п╨я┌п╬п╪ п╬п╠п╫п╬п╡п╩п╣п╫п╦п╣ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п╢п╩я▐ п©п╬п╩я┐я┤п╣п╫п╦я▐ п╩я▌п╠я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧, п╡п╫п╣я│п╣п╫п╫я▀я┘ п╢я─я┐пЁп╦п╪п╦ я─п╟п╥я─п╟п╠п╬я┌я┤п╦п╨п╟п╪п╦ п©я─п╬п╣п╨я┌п╟ я│ п╪п╬п╪п╣п╫я┌п╟ п╡п╟я┬п╣пЁп╬ п©п╬я│п╩п╣п╢п╫п╣пЁп╬ п╬п╠п╫п╬п╡п╩п╣п╫п╦я▐. п≤я│п©п╬п╩я▄п╥я┐п╧я┌п╣ svn update п╢п╩я▐ я│п╦п╫я┘я─п╬п╫п╦п╥п╟я├п╦п╦ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ я│ п©п╬я│п╩п╣п╢п╫п╣п╧ п©я─п╟п╡п╨п╬п╧ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣.

$ svn update
U  foo.c
U  bar.c
Updated to revision 2.

п▓ п╢п╟п╫п╫п╬п╪ я│п╩я┐я┤п╟п╣, п╨я┌п╬-я┌п╬ п╢я─я┐пЁп╬п╧ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟п╩ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я└п╟п╧п╩п╟я┘ foo.c п╦ bar.c п©п╬я│п╩п╣ п╡п╟я┬п╣пЁп╬ п©п╬я│п╩п╣п╢п╫п╣пЁп╬ п╬п╠п╫п╬п╡п╩п╣п╫п╦я▐, п╦ Subversion п╬п╠п╫п╬п╡п╦п╩п╟ п╡п╟я┬я┐ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п╡п╨п╩я▌я┤п╦п╡ я█я┌п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐.

п═п╟я│я│п╪п╬я┌я─п╦п╪ п©п╬п©п╬п╢я─п╬п╠п╫п╣п╣ п╦п╫я└п╬я─п╪п╟я├п╦я▌, п╡я▀п╡п╬п╢п╦п╪я┐я▌ п╨п╬п╪п╟п╫п╢п╬п╧ svn update. п п╬пЁп╢п╟ я│п╣я─п╡п╣я─ п╬я┌п©я─п╟п╡п╩я▐п╣я┌ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ п╡п╟я┬я┐ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п╢п╩я▐ п╨п╟п╤п╢п╬пЁп╬ я█п╩п╣п╪п╣п╫я┌п╟ п╡я▀п╡п╬п╢п╦я┌я│я▐ п╩п╟я┌п╦п╫я│п╨п╟я▐ п╠я┐п╨п╡п╟ Б─■ п╨п╬п╢, п╬п©я─п╣п╢п╣п╩я▐я▌я┴п╦п╧ п╢п╣п╧я│я┌п╡п╦п╣, п╡я▀п©п╬п╩п╫п╣п╫п╫п╬п╣ Subversion п╢п╩я▐ п©я─п╦п╡п╣п╢п╣п╫п╦я▐ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╡ п╟п╨я┌я┐п╟п╩я▄п╫п╬п╣ я│п╬я│я┌п╬я▐п╫п╦п╣:

п╒п╣п©п╣я─я▄ п╡я▀ п╪п╬п╤п╣я┌п╣ п©я─п╦я│я┌я┐п©п╟я┌я▄ п╨ п╢п╣п╩я┐ п╦ п╡п╫п╬я│п╦я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌. п п╟п╨ п©я─п╟п╡п╦п╩п╬, я├п╣п╩п╣я│п╬п╬п╠я─п╟п╥п╫п╣п╣ п╡я│п╣пЁп╬ я─п╟п╠п╬я┌п╟я┌я▄ п╬я┌п╢п╣п╩я▄п╫п╬ п©п╬ п╨п╟п╤п╢п╬п╪я┐ я┤п╟я│я┌п╫п╬п╪я┐ п╦п╥п╪п╣п╫п╣п╫п╦я▌ (п╦п╩п╦ п╫п╟п╠п╬я─я┐ п╦п╥п╪п╣п╫п╣п╫п╦п╧), я┌п╟п╨п╬п╪я┐ п╨п╟п╨ я─п╣п╟п╩п╦п╥п╟я├п╦я▐ п╫п╬п╡п╬п╧ я└я┐п╫п╨я├п╦п╬п╫п╟п╩я▄п╫п╬п╧ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌п╦, п╦я│п©я─п╟п╡п╩п╣п╫п╦п╣ п╬я┬п╦п╠п╨п╦ п╦ я┌. п©. п≈п╢п╣я│я▄ п╡я▀ п╠я┐п╢п╣я┌п╣ п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ я┌п╟п╨п╦п╪п╦ п╨п╬п╪п╟п╫п╢п╟п╪п╦ Subversion п╨п╟п╨ svn add, svn delete, svn copy п╦ svn move. п·п╢п╫п╟п╨п╬, п╣я│п╩п╦ п╡я▀ п©я─п╬я│я┌п╬ я─п╣п╢п╟п╨я┌п╦я─я┐п╣я┌п╣ я└п╟п╧п╩я▀, п╨п╬я┌п╬я─я▀п╣ я┐п╤п╣ п╫п╟я┘п╬п╢я▐я┌я│я▐ п©п╬п╢ п╨п╬п╫я┌я─п╬п╩п╣п╪ Subversion, п╫п╦ п╬п╢п╫п╟ п╦п╥ я█я┌п╦я┘ п╨п╬п╪п╟п╫п╢ п╡п╟п╪ п╫п╣ п╫я┐п╤п╫п╟. п▓ я│п╡п╬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╡я▀ п╪п╬п╤п╣я┌п╣ п╢п╣п╩п╟я┌я▄ я│п╩п╣п╢я┐я▌я┴п╦п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐:

п■п╩я▐ п╡п╫п╣я│п╣п╫п╦я▐ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╡ я└п╟п╧п╩я▀ п╦я│п©п╬п╩я▄п╥я┐п╧я┌п╣ я│п╡п╬п╧ я┌п╣п╨я│я┌п╬п╡я▀п╧ я─п╣п╢п╟п╨я┌п╬я─, я┌п╣п╨я│я┌п╬п╡я▀п╧ п©я─п╬я├п╣я│я│п╬я─, пЁя─п╟я└п╦я┤п╣я│п╨я┐я▌ п©я─п╬пЁя─п╟п╪п╪я┐ п╦п╩п╦ п╩я▌п╠п╬п╧ п╢я─я┐пЁп╬п╧ п╦п╫я│я┌я─я┐п╪п╣п╫я┌, п╨п╬я┌п╬я─я▀п╧ п╡я▀ п╬п╠я▀я┤п╫п╬ п╦я│п©п╬п╩я▄п╥я┐п╣я┌п╣. Subversion п╬п╠я─п╟п╠п╟я┌я▀п╡п╟п╣я┌ п╠п╦п╫п╟я─п╫я▀п╣ я└п╟п╧п╩я▀ я┌п╟п╨ п╤п╣ п╩п╣пЁп╨п╬ п╨п╟п╨ п╦ я┌п╣п╨я│я┌п╬п╡я▀п╣ Б─■ п╦ п╫п╟я│я┌п╬п╩я▄п╨п╬ п╤п╣ я█я└я└п╣п╨я┌п╦п╡п╫п╬.

п═п╟я│я│п╪п╬я┌я─п╦п╪ я┤п╣я┌я▀я─п╣ п©п╬п╢п╨п╬п╪п╟п╫п╢я▀ Subversion, п╨п╬я┌п╬я─я▀п╣ п╡я▀ я┤п╟я┴п╣ п╡я│п╣пЁп╬ п╠я┐п╢п╣я┌п╣ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п©я─п╦ п╡п╫п╣я│п╣п╫п╦п╦ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╡ я│я┌я─я┐п╨я┌я┐я─я┐ (п╨п╬п╪п╟п╫п╢я▀ svn import п╦ svn mkdir п╪я▀ я─п╟я│я│п╪п╬я┌я─п╦п╪ п©п╬п╥п╤п╣).

п▓п╫п╦п╪п╟п╫п╦п╣

п╔п╬я┌я▐ п╡я▀ п╪п╬п╤п╣я┌п╣ я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟я┌я▄ я└п╟п╧п╩я▀ п╩я▌п╠я▀п╪п╦ п©я─п╬пЁя─п╟п╪п╪п╫я▀п╪п╦ я│я─п╣п╢я│я┌п╡п╟п╪п╦, п╫п╣ я│п╩п╣п╢я┐п╣я┌ п╪п╣п╫я▐я┌я▄ я│я┌я─я┐п╨я┌я┐я─я┐ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, п╫п╣ п©я─п╬п╦п╫я└п╬я─п╪п╦я─п╬п╡п╟п╡ п╬ я│п╡п╬п╦я┘ п╢п╣п╧я│я┌п╡п╦я▐я┘ Subversion. п■п╩я▐ п╦п╥п╪п╣п╫п╣п╫п╦я▐ я│я┌я─я┐п╨я┌я┐я─я▀ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╦я│п©п╬п╩я▄п╥я┐п╧я┌п╣ п╨п╬п╪п╟п╫п╢я▀ svn copy, svn delete п╦ svn move, п╟ п╢п╩я▐ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▐ п╫п╬п╡я▀я┘ я└п╟п╧п╩п╬п╡ п╦ п╨п╟я┌п╟п╩п╬пЁп╬п╡ п©п╬п╢ п╨п╬п╫я┌я─п╬п╩я▄ п╡п╣я─я│п╦п╧ п╦я│п©п╬п╩я▄п╥я┐п╧я┌п╣ svn add.

п÷п╬я│п╩п╣ п╡п╫п╣я│п╣п╫п╦я▐ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╡я▀ п╢п╬п╩п╤п╫я▀ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟я┌я▄ п╦я┘ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣, п╫п╬ п©п╣я─п╣п╢ я█я┌п╦п╪ п╠я▀п╩п╬ п╠я▀ п╫п╣п©п╩п╬я┘п╬ п©п╬я│п╪п╬я┌я─п╣я┌я▄, я┤я┌п╬ п╤п╣, я│п╬п╠я│я┌п╡п╣п╫п╫п╬, п╡я▀ п╦п╥п╪п╣п╫п╦п╩п╦. п÷я─п╬п╟п╫п╟п╩п╦п╥п╦я─п╬п╡п╟п╡ п©п╣я─п╣п╢ я└п╦п╨я│п╟я├п╦п╣п╧ я│п╡п╬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╡я▀ я│п╪п╬п╤п╣я┌п╣ я│п╬я│я┌п╟п╡п╦я┌я▄ п╠п╬п╩п╣п╣ п╟п╨п╨я┐я─п╟я┌п╫п╬п╣ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╣. п я─п╬п╪п╣ я┌п╬пЁп╬, п╡я▀ п╪п╬п╤п╣я┌п╣ п╬п╠п╫п╟я─я┐п╤п╦я┌я▄, я┤я┌п╬ п╦п╥п╪п╣п╫п╦п╩п╦ я└п╟п╧п╩ п╫п╣п©я─п╣п╢п╫п╟п╪п╣я─п╣п╫п╫п╬, я┤я┌п╬ п©п╬п╥п╡п╬п╩п╦я┌ п╣я┴п╣ п╢п╬ я└п╦п╨я│п╟я├п╦п╦ п╡п╣я─п╫я┐я┌я▄ я└п╟п╧п╩ п╨ п©я─п╣п╢я▀п╢я┐я┴п╣п╪я┐ я│п╬я│я┌п╬я▐п╫п╦я▌. п  я┌п╬п╪я┐ п╤п╣, я█я┌п╬ я┘п╬я─п╬я┬п╟я▐ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п©п╣я─п╣я│п╪п╬я┌я─п╣я┌я▄ п╦ п©я─п╬п╡п╣я─п╦я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п©п╣я─п╣п╢ п╦я┘ п©я┐п╠п╩п╦п╨п╟я├п╦п╣п╧. п╖я┌п╬п╠я▀ я┐п╡п╦п╢п╣я┌я▄ п╡я│п╣ я│п╢п╣п╩п╟п╫п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╡я▀ п╪п╬п╤п╣я┌п╣ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ svn status, svn diff п╦ svn revert. п÷п╣я─п╡я▀п╣ п╢п╡п╣ п╨п╬п╪п╟п╫п╢я▀ п╡я▀ п╪п╬п╤п╣я┌п╣ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ п╫п╟п╧я┌п╦ п╦п╥п╪п╣п╫п╣п╫п╫я▀п╣ я└п╟п╧п╩я▀ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, п╟ п╥п╟я┌п╣п╪, п©я─п╦ п©п╬п╪п╬я┴п╦ я┌я─п╣я┌я▄п╣п╧, п╬я┌п╪п╣п╫п╦я┌я▄ п╫п╣п╨п╬я┌п╬я─я▀п╣ (п╦п╩п╦ п╡я│п╣) п╦п╥п╪п╣п╫п╣п╫п╦я▐.

Subversion п╠я▀п╩п╟ п╬п©я┌п╦п╪п╦п╥п╦я─п╬п╡п╟п╫п╟ п╢п╩я▐ я─п╣я┬п╣п╫п╦я▐ я┌п╟п╨п╬п╧ п╥п╟п╢п╟я┤п╦ п╦ я│п©п╬я│п╬п╠п╫п╟ п╡я▀п©п╬п╩п╫я▐я┌я▄ п╪п╫п╬п╤п╣я│я┌п╡п╬ п╢п╣п╧я│я┌п╡п╦п╧ п╠п╣п╥ п╬п╠я─п╟я┴п╣п╫п╦я▐ п╨ я┘я─п╟п╫п╦п╩п╦я┴я┐. п▓ я┤п╟я│я┌п╫п╬я│я┌п╦, я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ я│п╬п╢п╣я─п╤п╦я┌ п╡ .svn-п╬п╠п╩п╟я│я┌п╦ я│п╨я─я▀я┌я┐я▌ п╨я█я┬п╦я─п╬п╡п╟п╫я┐я▌ б╚п╫п╣я┌я─п╬п╫я┐я┌я┐я▌б╩ п╨п╬п©п╦я▌ п╨п╟п╤п╢п╬пЁп╬ п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫п╬пЁп╬ я└п╟п╧п╩п╟. п≈п╟ я│я┤п╣я┌ я█я┌п╬пЁп╬ Subversion п╪п╬п╤п╣я┌ п╠я▀я│я┌я─п╬ п©п╬п╨п╟п╥п╟я┌я▄, п╨п╟п╨ п╦п╥п╪п╣п╫п╦п╩п╦я│я▄ п╡п╟я┬п╦ я─п╟п╠п╬я┤п╦п╣ я└п╟п╧п╩я▀ п╦п╩п╦ п╢п╟п╤п╣ п©я─п╣п╢п╬я│я┌п╟п╡п╦я┌я▄, п╫п╣ я│п╡я▐п╥я▀п╡п╟я▐я│я▄ я│ я┘я─п╟п╫п╦п╩п╦я┴п╣п╪, п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п╬я┌п╨п╟я┌п╦я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐.

  L     some_dir            # svn п╬я│я┌п╟п╡п╦п╩п╟ п╠п╩п╬п╨п╦я─п╬п╡п╨я┐ п╡ .svn-п╬п╠п╩п╟я│я┌п╦ п╢п╩я▐ some_dir
M       bar.c               # я│п╬п╢п╣я─п╤п╦п╪п╬п╣ bar.c п╦п╪п╣п╣я┌ п╩п╬п╨п╟п╩я▄п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐
 M      baz.c               # п╡ baz.c п╣я│я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я│п╡п╬п╧я│я┌п╡п╟я┘, п╟ п╡ я│п╬п╢п╣я─п╤п╦п╪п╬п╪ п╫п╣я┌
X       3rd_party           # п╨п╟я┌п╟п╩п╬пЁ я▐п╡п╩я▐п╣я┌я│я▐ я┤п╟я│я┌я▄я▌ п╡п╫п╣я┬п╫п╣п╧ п╥п╟п╡п╦я│п╦п╪п╬я│я┌п╦
?       foo.o               # svn п╫п╣ я┐п©я─п╟п╡п╩я▐п╣я┌ foo.o
!       some_dir            # svn я┐п©я─п╟п╡п╩я▐п╣я┌ я█я┌п╦п╪ я█п╩п╣п╪п╣п╫я┌п╬п╪, п╫п╬ п╬п╫ п╬я┌я│я┐я┌я│я┌п╡я┐п╣я┌ п╦п╩п╦ п©п╬п╡я─п╣п╤п╢п╣п╫
~       qux                 # я█п╩п╣п╪п╣п╫я┌ п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╩я│я▐ п╨п╟п╨ я└п╟п╧п╩/п╨п╟я┌п╟п╩п╬пЁ/я│я│я▀п╩п╨п╟, п╫п╬ я┌п╦п© п╠я▀п╩ п╦п╥п╪п╣п╫п╣п╫
I       .screenrc           # svn п╫п╣ я┐п©я─п╟п╡п╩я▐п╣я┌ я█я┌п╦п╪ я█п╩п╣п╪п╣п╫я┌п╬п╪ п╦ п╫п╟я│я┌я─п╬п╣п╫п╟ п╫п╟ п╣пЁп╬ п╦пЁп╫п╬я─п╦я─п╬п╡п╟п╫п╦п╣
A  +    moved_dir           # п╢п╬п╠п╟п╡п╩п╣п╫ я│ п╦я│я┌п╬я─п╦п╣п╧ я│п╡п╬п╣пЁп╬ п©я─п╬п╦я│я┘п╬п╤п╢п╣п╫п╦я▐
M  +    moved_dir/README    # п╢п╬п╠п╟п╡п╩п╣п╫ я│ п╦я│я┌п╬я─п╦п╣п╧ п╦ п╦п╪п╣п╣я┌ п╩п╬п╨п╟п╩я▄п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐
D       stuff/fish.c        # я└п╟п╧п╩ п╥п╟п©п╩п╟п╫п╦я─п╬п╡п╟п╫ п╢п╩я▐ я┐п╢п╟п╩п╣п╫п╦я▐
A       stuff/loot/bloo.h   # я└п╟п╧п╩ п╥п╟п©п╩п╟п╫п╦я─п╬п╡п╟п╫ п╢п╩я▐ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▐
C       stuff/loot/lump.c   # я└п╟п╧п╩ п╦п╪п╣п╣я┌ я┌п╣п╨я│я┌п╬п╡я▀п╧ п╨п╬п╫я└п╩п╦п╨я┌ я│ п╪п╬п╪п╣п╫я┌п╟ п╬п╠п╫п╬п╡п╩п╣п╫п╦я▐
 C      stuff/loot/glub.c   # я└п╟п╧п╩ п╦п╪п╣п╣я┌ п╨п╬п╫я└п╩п╦п╨я┌ п╡ я│п╡п╬п╧я│я┌п╡п╟я┘ я│ п╪п╬п╪п╣п╫я┌п╟ п╬п╠п╫п╬п╡п╩п╣п╫п╦я▐
R       xyz.c               # я└п╟п╧п╩ п╥п╟п©п╩п╟п╫п╦я─п╬п╡п╟п╫ п╢п╩я▐ п╥п╟п╪п╣п╫я▀
    S   stuff/squawk        # я└п╟п╧п╩ п╦п╩п╦ п╨п╟я┌п╟п╩п╬пЁ п╠я▀п╩п╦ п©п╣я─п╣п╨п╩я▌я┤п╣п╫я▀ п╫п╟ п╡п╣я┌п╨я┐
     K  dog.jpg             # я└п╟п╧п╩ п╥п╟п╠п╩п╬п╨п╦я─п╬п╡п╟п╫ п╩п╬п╨п╟п╩я▄п╫п╬; п©я─п╦я│я┐я┌я│я┌п╡я┐п╣я┌ п╪п╟я─п╨п╣я─ п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╦я▐
     O  cat.jpg             # я└п╟п╧п╩ п╥п╟п╠п╩п╬п╨п╦я─п╬п╡п╟п╫ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ п╢я─я┐пЁп╦п╪ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╣п╪
     B  bird.jpg            # я└п╟п╧п╩ п╥п╟п╠п╩п╬п╨п╦я─п╬п╡п╟п╫ п╩п╬п╨п╟п╩я▄п╫п╬, п╫п╬ п╠п╩п╬п╨п╦я─п╬п╡п╨п╟ п╠я▀п╩п╟ п╫п╟я─я┐я┬п╣п╫п╟
     T  fish.jpg            # я└п╟п╧п╩ п╥п╟п╠п╩п╬п╨п╦я─п╬п╡п╟п╫ п╩п╬п╨п╟п╩я▄п╫п╬, п╫п╬ п╠п╩п╬п╨п╦я─п╬п╡п╨п╟ п╠я▀п╩п╟ я│п╫я▐я┌п╟

$ svn status stuff/fish.c
D      stuff/fish.c

$ svn status --verbose
M               44        23    sally     README
                44        30    sally     INSTALL
M               44        20    harry     bar.c
                44        18    ira       stuff
                44        35    harry     stuff/trout.c
D               44        19    ira       stuff/fish.c
                44        21    sally     stuff/things
A                0         ?     ?        stuff/things/bloo.h
                44        36    harry     stuff/things/gloo.c

$ svn status --show-updates --verbose
M      *        44        23    sally     README
M               44        20    harry     bar.c
       *        44        35    harry     stuff/trout.c
D               44        19    ira       stuff/fish.c
A                0         ?     ?        stuff/things/bloo.h
Status against revision:   46

$ svn diff
Index: bar.c
===================================================================
--- bar.c (revision 3)
+++ bar.c (working copy)
@@ -1,7 +1,12 @@
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <stdio.h>

 int main(void) {
-  printf("Sixty-four slices of American Cheese...\n");
+  printf("Sixty-five slices of American Cheese...\n");
 return 0;
 }

Index: README
===================================================================
--- README  (revision 3)
+++ README  (working copy)
@@ -193,3 +193,4 @@
+Note to self:  pick up laundry.

Index: stuff/fish.c
===================================================================
--- stuff/fish.c  (revision 1)
+++ stuff/fish.c  (working copy)
-Welcome to the file known as 'fish'.
-Information on fish will be here soon.

Index: stuff/things/bloo.h
===================================================================
--- stuff/things/bloo.h (revision 8)
+++ stuff/things/bloo.h (working copy)
+Here is a new file to describe
+things about bloo.

$ svn diff > patchfile

svn revert

п╒п╣п©п╣я─я▄ п©я─п╣п╢п©п╬п╩п╬п╤п╦п╪, я┤я┌п╬, п©я─п╬я│п╪п╬я┌я─п╣п╡ п╡я▀п╡п╬п╢ п╨п╬п╪п╟п╫п╢я▀ diff, п╡я▀ п╬п╠п╫п╟я─я┐п╤п╦п╩п╦, я┤я┌п╬ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ README п╬я┬п╦п╠п╬я┤п╫я▀ Б─■ п╨ п©я─п╦п╪п╣я─я┐, п©п╬я┌п╬п╪я┐, я┤я┌п╬ п╡ я│п╡п╬п╣п╪ я─п╣п╢п╟п╨я┌п╬я─п╣ п╡я▀ я│п╩я┐я┤п╟п╧п╫п╬ п╫п╟п╠я─п╟п╩п╦ я┌п╣п╨я│я┌, п©я─п╣п╢п╫п╟п╥п╫п╟я┤п╟п╡я┬п╦п╧я│я▐ п╢п╩я▐ п╢я─я┐пЁп╬пЁп╬ я└п╟п╧п╩п╟.

п▓ я┌п╟п╨п╬п╧ я│п╦я┌я┐п╟я├п╦п╦ п╨п╟п╨ п╫п╣п╩я▄п╥я▐ п╨я│я┌п╟я┌п╦ п╬п╨п╟п╤п╣я┌я│я▐ п╨п╬п╪п╟п╫п╢п╟ svn revert.

$ svn revert README
Reverted 'README'

Subversion п╡п╬п╥п╡я─п╟я┴п╟п╣я┌ я└п╟п╧п╩ п╡ я│п╬я│я┌п╬я▐п╫п╦п╣, п©я─п╣п╢я┬п╣я│я┌п╡я┐я▌я┴п╣п╣ п╪п╬п╢п╦я└п╦п╨п╟я├п╦п╦, п©я┐я┌п╣п╪ п╥п╟п╪п╣п╫я▀ я└п╟п╧п╩п╟ п╣пЁп╬ п╨я█я┬п╦я─п╬п╡п╟п╫п╫п╬п╧ б╚п©п╣я─п╡п╬п╫п╟я┤п╟п╩я▄п╫п╬п╧б╩ п╨п╬п©п╦п╣п╧ п╦п╥ .svn-п╬п╠п╩п╟я│я┌п╦. п я─п╬п╪п╣ я┌п╬пЁп╬, п╬п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣, я┤я┌п╬ svn revert п╪п╬п╤п╣я┌ п╬я┌п╪п╣п╫п╦я┌я▄ п╩я▌п╠я▀п╣ п╥п╟п©п╩п╟п╫п╦я─п╬п╡п╟п╫п╫я▀п╣ п╬п©п╣я─п╟я├п╦п╦ Б─■ п╫п╟п©я─п╦п╪п╣я─, п╡я▀ п╪п╬п╤п╣я┌п╣ п©я─п╦п╧я┌п╦ п╨ я─п╣я┬п╣п╫п╦я▌ п╡я│я▒-я┌п╟п╨п╦ п╫п╣ п╢п╬п╠п╟п╡п╩я▐я┌я▄ п╫п╬п╡я▀п╧ я└п╟п╧п╩:

$ svn status foo
?      foo

$ svn add foo
A         foo

$ svn revert foo
Reverted 'foo'

$ svn status foo
?      foo

п≈п╟п╪п╣я┤п╟п╫п╦п╣

svn revert ITEM п╠я┐п╢п╣я┌ п╦п╪п╣я┌я▄ я┌п╬я┤п╫п╬ я┌п╟п╨п╬п╧ п╤п╣ я█я└я└п╣п╨я┌, п╨п╟п╨ п╦ я┐п╢п╟п╩п╣п╫п╦п╣ ITEM п╦п╥ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, п╟ п╥п╟я┌п╣п╪ п╡я▀п©п╬п╩п╫п╣п╫п╦п╣ svn update -r BASE ITEM. п·п╢п╫п╟п╨п╬, п╣я│п╩п╦ п╡я▀ п╬я┌п╪п╣п╫я▐п╣я┌п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╢п╩я▐ я└п╟п╧п╩п╟, svn revert п╠я┐п╢п╣я┌ п╦п╪п╣я┌я▄ п╬п╢п╫п╬ п╥п╫п╟я┤п╦я┌п╣п╩я▄п╫п╬п╣ п╬я┌п╩п╦я┤п╦п╣ Б─■ п╢п╩я▐ п╡п╬я│я│я┌п╟п╫п╬п╡п╩п╣п╫п╦я▐ я└п╟п╧п╩п╟ п╫п╣ п©я─п╬п╦я│я┘п╬п╢п╦я┌ я│п╬п╣п╢п╦п╫п╣п╫п╦я▐ я│ я┘я─п╟п╫п╦п╩п╦я┴п╣п╪.

п≤п╩п╦, п╢п╬п©я┐я│я┌п╦п╪, п╡я▀ п╬я┬п╦п╠п╬я┤п╫п╬ я┐п╢п╟п╩п╦п╩п╦ я└п╟п╧п╩ п╦п╥-п©п╬п╢ п╨п╬п╫я┌я─п╬п╩я▐ п╡п╣я─я│п╦п╧:

$ svn status README
       README

$ svn delete README
D         README

$ svn revert README
Reverted 'README'

$ svn status README
       README

п°я▀ я┐п╤п╣ п╡п╦п╢п╣п╩п╦, п╨п╟п╨ svn status -u п╪п╬п╤п╣я┌ п©я─п╣п╢я┐п©я─п╣п╢п╦я┌я▄ п╬ п╨п╬п╫я└п╩п╦п╨я┌п╟я┘. п÷я─п╣п╢п©п╬п╩п╬п╤п╦п╪, п╡я▀ п╥п╟п©я┐я│я┌п╦п╩п╦ svn update п╦ я┐п╡п╦п╢п╣п╩п╦ п╨п╬п╣-я┤я┌п╬ п╦п╫я┌п╣я─п╣я│п╫п╬п╣:

$ svn update
U  INSTALL
G  README
C  bar.c
Updated to revision 46.

п п╬п╢я▀ U п╦ G п╦п╫я┌п╣я─п╣я│п╟ п╫п╣ п©я─п╣п╢я│я┌п╟п╡п╩я▐я▌я┌; я█я┌п╦ я└п╟п╧п╩я▀ п╠п╣п╥ п©я─п╬п╠п╩п╣п╪ п©п╬пЁп╩п╬я┌п╦п╩п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟. п╓п╟п╧п╩я▀, п╬я┌п╪п╣я┤п╣п╫п╫я▀п╣ U, п╩п╬п╨п╟п╩я▄п╫я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╫п╣ я│п╬п╢п╣я─п╤п╟я┌ п╦ п╠я▀п╩п╦ Updated Б─■ п╬п╠п╫п╬п╡п╩п╣п╫я▀ п╦п╥п╪п╣п╫п╣п╫п╦я▐п╪п╦ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟. п·я┌п╪п╣я┤п╣п╫п╫я▀п╣ G п╠я▀п╩п╦ merGed Б─■ я│п╩п╦я┌я▀, я█я┌п╬ п╥п╫п╟я┤п╦я┌, я┤я┌п╬ я└п╟п╧п╩ п╦п╪п╣п╩ п╩п╬п╨п╟п╩я▄п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╫п╬ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п©я─п╦я┬п╣п╢я┬п╦п╣ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟, п╫п╣ п©п╣я─п╣п╨я─я▀п╡п╟я▌я┌я│я▐ я│ п╩п╬п╨п╟п╩я▄п╫я▀п╪п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐п╪п╦.

п░ п╡п╬я┌ я└п╟п╧п╩я▀, п╬я┌п╪п╣я┤п╣п╫п╫я▀п╣ C, п╦п╪п╣я▌я┌ п╨п╬п╫я└п╩п╦п╨я┌. п╜я┌п╬ п╥п╫п╟я┤п╦я┌, я┤я┌п╬ п╦п╥п╪п╣п╫п╣п╫п╦я▐ я│ я│п╣я─п╡п╣я─п╟ п©п╣я─п╣я│п╣п╨п╩п╦я│я▄ я│ п╡п╟я┬п╦п╪п╦ п╩п╦я┤п╫я▀п╪п╦, п╦ я┌п╣п©п╣я─я▄ п╡п╟п╪ п╫я┐п╤п╫п╬ п╡я─я┐я┤п╫я┐я▌ я│п╢п╣п╩п╟я┌я▄ п╪п╣п╤п╢я┐ п╫п╦п╪п╦ п╡я▀п╠п╬я─.

п▓я│я▐п╨п╦п╧ я─п╟п╥, п╨п╬пЁп╢п╟ п╡п╬п╥п╫п╦п╨п╟п╣я┌ п╨п╬п╫я└п╩п╦п╨я┌, п╡ п╣пЁп╬ п╬п╠п╫п╟я─я┐п╤п╣п╫п╦п╦ п╦ я─п╟п╥я─п╣я┬п╣п╫п╦п╦ п╡п╟п╪, п╨п╟п╨ п©я─п╟п╡п╦п╩п╬, п©п╬п╪п╬пЁп╟я▌я┌ я┌я─п╦ п╡п╣я┴п╦:

п²п╟п©я─п╦п╪п╣я─, п║п╟п╩п╩п╦ п╡п╫п╣я│п╩п╟ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я└п╟п╧п╩ sandwich.txt п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟. п·п╢п╫п╬п╡я─п╣п╪п╣п╫п╫п╬ п⌠п╟я─я─п╦ п╦п╥п╪п╣п╫п╦п╩ я└п╟п╧п╩ п╡ я│п╡п╬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╦ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟п╩ п╣пЁп╬. п║п╟п╩п╩п╦ п╬п╠п╫п╬п╡п╩я▐п╣я┌ я│п╡п╬я▌ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ п©п╣я─п╣п╢ я└п╦п╨я│п╟я├п╦п╣п╧ п╦ п©п╬п╩я┐я┤п╟п╣я┌ п╨п╬п╫я└п╩п╦п╨я┌:

$ svn update
C  sandwich.txt
Updated to revision 2.
$ ls -1
sandwich.txt
sandwich.txt.mine
sandwich.txt.r1
sandwich.txt.r2

п╒п╣п©п╣я─я▄ Subversion п╫п╣ п©п╬п╥п╡п╬п╩п╦я┌ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟я┌я▄ я└п╟п╧п╩ sandwich.txt, п©п╬п╨п╟ п╫п╣ п╠я┐п╢я┐я┌ я┐п╢п╟п╩п╣п╫я▀ я┌я─п╦ п╡я─п╣п╪п╣п╫п╫я▀я┘ я└п╟п╧п╩п╟.

$ svn commit --message "Add a few more things"
svn: Commit failed (details follow):
svn: Aborting commit: '/home/sally/svn-work/sandwich.txt' remains in conflict

п■п╩я▐ я─п╟п╥я─п╣я┬п╣п╫п╦я▐ п╨п╬п╫я└п╩п╦п╨я┌п╟ я┐ п╡п╟я│ п╣я│я┌я▄ я┌я─п╦ п╡п╟я─п╦п╟п╫я┌п╟:

п÷п╬я│п╩п╣ я─п╟п╥я─п╣я┬п╣п╫п╦я▐ п╨п╬п╫я└п╩п╦п╨я┌п╟ п╡п╟п╪ п╫я┐п╤п╫п╬ п╦п╥п╡п╣я│я┌п╦я┌я▄ п╬п╠ я█я┌п╬п╪ Subversion, п╡я▀п©п╬п╩п╫п╦п╡ svn resolved. п╜я┌п╟ п╨п╬п╪п╟п╫п╢п╟ я┐п╢п╟п╩п╦я┌ я┌я─п╦ п╡я─п╣п╪п╣п╫п╫я▀я┘ я└п╟п╧п╩п╟, п╦ Subversion п╠п╬п╩я▄я┬п╣ п╫п╣ п╠я┐п╢п╣я┌ я│я┤п╦я┌п╟я┌я▄, я┤я┌п╬ я└п╟п╧п╩ п╫п╟я┘п╬п╢п╦я┌я│я▐ п╡ я│п╬я│я┌п╬я▐п╫п╦п╦ п╨п╬п╫я└п╩п╦п╨я┌п╟. ^[10]

$ svn resolved sandwich.txt
Resolved conflicted state of 'sandwich.txt'

$ cat sandwich.txt
Top piece of bread
Mayonnaise
Lettuce
Tomato
Provolone
<<<<<<< .mine
Salami
Mortadella
Prosciutto
=======
Sauerkraut
Grilled Chicken
>>>>>>> .r2
Creole Mustard
Bottom piece of bread

<<<<<<< .mine
Salami
Mortadella
Prosciutto
=======

=======
Sauerkraut
Grilled Chicken
>>>>>>> .r2

Top piece of bread
Mayonnaise
Lettuce
Tomato
Provolone
Salami
Mortadella
Prosciutto
Creole Mustard
Bottom piece of bread

$ svn resolved sandwich.txt
$ svn commit -m "Go ahead and use my sandwich, discarding Sally's edits."

$ svn update
C  sandwich.txt
Updated to revision 2.
$ ls sandwich.*
sandwich.txt  sandwich.txt.mine  sandwich.txt.r2  sandwich.txt.r1
$ cp sandwich.txt.r2 sandwich.txt
$ svn resolved sandwich.txt

$ svn revert sandwich.txt
Reverted 'sandwich.txt'
$ ls sandwich.*
sandwich.txt

п²п╟п╨п╬п╫п╣я├-я┌п╬! п▓я▀ п╥п╟п╨п╬п╫я┤п╦п╩п╦ я│ я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟п╫п╦п╣п╪, я│п╩п╦п╩п╦ п╡я│п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ я│ я│п╣я─п╡п╣я─п╟ п╦ пЁп╬я┌п╬п╡я▀ п╨ я┌п╬п╪я┐, я┤я┌п╬п╠я▀ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟я┌я▄ п╦я┘ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣.

п п╬п╪п╟п╫п╢п╟ svn commit п╬я┌п©я─п╟п╡п╩я▐п╣я┌ п╡я│п╣ п╡п╟я┬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣. п÷я─п╦ я└п╦п╨я│п╟я├п╦п╦ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п╬п©п╦я│п╟я┌я▄ п╡п╟я┬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я┌п╣п╨я│я┌п╣ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦я▐. п⌡п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╣ п╠я┐п╢п╣я┌ п©я─п╦я│п╬п╣п╢п╦п╫п╣п╫п╬ п╨ я│п╬п╥п╢п╟п╫п╫п╬п╧ п©я─п╟п╡п╨п╣. п∙я│п╩п╦ п╡п╟я┬п╣ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╣ п╨п╬я─п╬я┌п╨п╬п╣, п╡я▀ п╪п╬п╤п╣я┌п╣ я┐п╨п╟п╥п╟я┌я▄ п╣пЁп╬ п╡ п╨п╬п╪п╟п╫п╢п╫п╬п╧ я│я┌я─п╬п╨п╣, п╦я│п©п╬п╩я▄п╥я┐я▐ п╬п©я├п╦я▌ --message (п╦п╩п╦ -m):

$ svn commit --message "Corrected number of cheese slices."
Sending        sandwich.txt
Transmitting file data .
Committed revision 3.

п·п╢п╫п╟п╨п╬, п╣я│п╩п╦ п╡я▀ п╥п╟я─п╟п╫п╣п╣ я│п╬я│я┌п╟п╡п╩я▐п╩п╦ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╣ п╡ п©я─п╬я├п╣я│я│п╣ я─п╟п╠п╬я┌я▀, п╪п╬п╤п╫п╬ п©п╬п©я─п╬я│п╦я┌я▄ Subversion п╡п╥я▐я┌я▄ п╣пЁп╬ п╦п╥ я└п╟п╧п╩п╟, п©п╣я─п╣п╢п╟п╡ п╦п╪я▐ я█я┌п╬пЁп╬ я└п╟п╧п╩п╟ п╡ п©п╟я─п╟п╪п╣я┌я─п╣ --file:

$ svn commit --file logmsg
Sending        sandwich.txt
Transmitting file data .
Committed revision 4.

п∙я│п╩п╦ п╡я▀ п╫п╣ я┐п╨п╟п╤п╣я┌п╣ п╫п╦ п╬п©я├п╦п╦ --message, п╫п╦ п╬п©я├п╦п╦ --file, п╢п╩я▐ я│п╬я│я┌п╟п╡п╩п╣п╫п╦я▐ п╩п╬пЁ я│п╬п╬п╠я┴п╣п╫п╦я▐ Subversion п╟п╡я┌п╬п╪п╟я┌п╦я┤п╣я│п╨п╦ п╥п╟п©я┐я│я┌п╦я┌ п╡п╟я┬ п╩я▌п╠п╦п╪я▀п╧ я─п╣п╢п╟п╨я┌п╬я─ (я│п╪. editor-cmd п╡ я─п╟п╥п╢п╣п╩п╣ б╚Configб╩).

п÷п╬п╢я│п╨п╟п╥п╨п╟

п∙я│п╩п╦, п╫п╟п╠п╦я─п╟я▐ я│п╬п╬п╠я┴п╣п╫п╦п╣ п╡ я─п╣п╢п╟п╨я┌п╬я─п╣, п╡я▀ я─п╣я┬п╦я┌п╣ п╬я┌п╪п╣п╫п╦я┌я▄ я└п╦п╨я│п╟я├п╦я▌, я┌п╬ п╪п╬п╤п╣я┌п╣ п©я─п╬я│я┌п╬ п╡я▀п╧я┌п╦ п╦п╥ я─п╣п╢п╟п╨я┌п╬я─п╟ п╠п╣п╥ я│п╬я┘я─п╟п╫п╣п╫п╦я▐ п╦п╥п╪п╣п╫п╣п╫п╦п╧. п∙я│п╩п╦ п╡я▀ я┐п╤п╣ я│п╬я┘я─п╟п╫п╦п╩п╦ я│п╬п╬п╠я┴п╣п╫п╦п╣, п©я─п╬я│я┌п╬ я┐п╢п╟п╩п╦я┌п╣ я┌п╣п╨я│я┌ п╦ п╡я▀п©п╬п╩п╫п╦я┌п╣ я│п╬я┘я─п╟п╫п╣п╫п╦п╣ п╣я┴п╣ я─п╟п╥. $ svn commit Waiting for Emacs...Done Log message unchanged or not specified a)bort, c)ontinue, e)dit a $

п╔я─п╟п╫п╦п╩п╦я┴п╣, п╡ п╬п╠я┴п╣п╪-я┌п╬, п╫п╣ п╥п╫п╟п╣я┌ п╫п╦я┤п╣пЁп╬ п╬ я│п╪я▀я│п╩п╣ п╡п╟я┬п╦я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧; п╬п╫п╬ я┌п╬п╩я▄п╨п╬ п╨п╬п╫я┌я─п╬п╩п╦я─я┐п╣я┌, я┤я┌п╬п╠я▀ п╫п╦п╨я┌п╬ п╫п╣ п╦п╥п╪п╣п╫п╦п╩ я┌п╣ п╤п╣ я└п╟п╧п╩я▀, я┤я┌п╬ п╦ п╡я▀. п∙я│п╩п╦ я█я┌п╬ п╡я│п╣-я┌п╟п╨п╦ я│п╩я┐я┤п╦п╩п╬я│я▄, п╡я│я▐ я└п╦п╨я│п╟я├п╦я▐ п╠я┐п╢п╣я┌ п╬я┌п╨п╩п╬п╫п╣п╫п╟, п╦ п╡я▀ п©п╬п╩я┐я┤п╦я┌п╣ я│п╬п╬п╠я┴п╣п╫п╦п╣ п╬ я┌п╬п╪, я┤я┌п╬ п╬п╢п╦п╫ п╦п╩п╦ п╫п╣я│п╨п╬п╩я▄п╨п╬ я└п╟п╧п╩п╬п╡ я┐я│я┌п╟я─п╣п╩п╦:

$ svn commit --message "Add another rule"
Sending        rules.txt
svn: Commit failed (details follow):
svn: Out of date: 'rules.txt' in transaction 'g'

п▓ я┌п╟п╨п╬п╪ я│п╩я┐я┤п╟п╣ п╡п╟п╪ п╫я┐п╤п╫п╬ п╡я▀п©п╬п╩п╫п╦я┌я▄ svn update, я─п╟п╥п╬п╠я─п╟я┌я▄я│я▐ я│п╬ п╡я│п╣п╪п╦ я│п╩п╦я▐п╫п╦я▐п╪п╦ п╦ п╨п╬п╫я└п╩п╦п╨я┌п╟п╪п╦ п╦ п©п╬п©я▀я┌п╟я┌я▄я│я▐ п╡я▀п©п╬п╩п╫п╦я┌я▄ я└п╦п╨я│п╟я├п╦я▌ я│п╫п╬п╡п╟.

п°я▀ я─п╟я│я│п╪п╬я┌я─п╣п╩п╦ п©я─п╬я│я┌п╣п╧я┬п╦п╧ я─п╟п╠п╬я┤п╦п╧ я├п╦п╨п╩ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ Subversion. п▓ Subversion я│я┐я┴п╣я│я┌п╡я┐п╣я┌ п╪п╫п╬пЁп╬ п╢я─я┐пЁп╦я┘ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌п╣п╧, п╨п╬я┌п╬я─я▀п╣ п╡я▀ п╪п╬п╤п╣я┌п╣ п©я─п╦п╪п╣п╫я▐я┌я▄ п╢п╩я▐ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╣п╧ п╦ я┘я─п╟п╫п╦п╩п╦я┴п╣п╪; п╫п╬ п╬я┤п╣п╫я▄ п╪п╫п╬пЁп╬п╣ п╪п╬п╤п╫п╬ я│п╢п╣п╩п╟я┌я▄, п╦я│п©п╬п╩я▄п╥я┐я▐ п╦я│п╨п╩я▌я┤п╦я┌п╣п╩я▄п╫п╬ п╨п╬п╪п╟п╫п╢я▀, я─п╟я│я│п╪п╬я┌я─п╣п╫п╫я▀п╣ п╡ я█я┌п╬п╧ пЁп╩п╟п╡п╣.

п■п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ п╫п╟п╧я┌п╦ п╦п╫я└п╬я─п╪п╟я├п╦я▌ п╬ я┘я─п╬п╫п╬п╩п╬пЁп╦п╦ я└п╟п╧п╩п╟ п╦п╩п╦ п╨п╟я┌п╟п╩п╬пЁп╟, п╡п╬я│п©п╬п╩я▄п╥я┐п╧я┌п╣я│я▄ п╨п╬п╪п╟п╫п╢п╬п╧ svn log. svn log п©п╬п╨п╟п╥я▀п╡п╟п╣я┌ п╦п╫я└п╬я─п╪п╟я├п╦я▌ п╬ я┌п╬п╪, п╨я┌п╬ п╦п╥п╪п╣п╫я▐п╩ я└п╟п╧п╩ п╦п╩п╦ п╨п╟я┌п╟п╩п╬пЁ, п╡ п╨п╟п╨п╬п╧ п©я─п╟п╡п╨п╣ я█я┌п╬ п©я─п╬п╦п╥п╬я┬п╩п╬, п╢п╟я┌я┐ п╦ п╡я─п╣п╪я▐ п©я─п╟п╡п╨п╦ п╦ п©я─п╦я│п╬п╣п╢п╦п╫п╣п╫п╫п╬п╣ п╨ я└п╦п╨я│п╟я├п╦п╦ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╣, п╣я│п╩п╦ п╬п╫п╬ п╢п╬я│я┌я┐п©п╫п╬.

$ svn log
------------------------------------------------------------------------
r3 | sally | Mon, 15 Jul 2002 18:03:46 -0500 | 1 line

Added include lines and corrected # of cheese slices.
------------------------------------------------------------------------
r2 | harry | Mon, 15 Jul 2002 17:47:57 -0500 | 1 line

Added main() methods.
------------------------------------------------------------------------
r1 | sally | Mon, 15 Jul 2002 17:40:08 -0500 | 1 line

Initial import
------------------------------------------------------------------------

п·п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ я┌п╬, я┤я┌п╬ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌ п╩п╬пЁ я│п╬п╬п╠я┴п╣п╫п╦я▐ п╡я▀п╡п╬п╢я▐я┌я│я▐ п╡ п╬п╠я─п╟я┌п╫п╬п╪ я┘я─п╬п╫п╬п╩п╬пЁп╦я┤п╣я│п╨п╬п╪ п©п╬я─я▐п╢п╨п╣. п∙я│п╩п╦ п╡п╟п╪ п╫я┐п╤п╫п╬ я┐п╡п╦п╢п╣я┌я▄ п╢я─я┐пЁп╬п╧ п╢п╦п╟п©п╟п╥п╬п╫ п©я─п╟п╡п╬п╨ п╡ п╥п╟я─п╟п╫п╣п╣ п╬п©я─п╣п╢п╣п╩п╣п╫п╫п╬п╪ п©п╬я─я▐п╢п╨п╣ п╦п╩п╦ я┌п╬п╩я▄п╨п╬ п╬п╢п╫я┐ п©я─п╟п╡п╨я┐, я┐п╨п╟п╤п╦я┌п╣ п©п╟я─п╟п╪п╣я┌я─ --revision (-r):

$ svn log --revision 5:19    # shows logs 5 through 19 in chronological order

$ svn log -r 19:5            # shows logs 5 through 19 in reverse order

$ svn log -r 8               # shows log for revision 8

п я─п╬п╪п╣ я┌п╬пЁп╬, п╪п╬п╤п╫п╬ п©я─п╬п╟п╫п╟п╩п╦п╥п╦я─п╬п╡п╟я┌я▄ п╦я│я┌п╬я─п╦я▌ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╧ п╬я┌п╢п╣п╩я▄п╫п╬пЁп╬ я└п╟п╧п╩п╟ п╦п╩п╦ п╨п╟я┌п╟п╩п╬пЁп╟. п²п╟п©я─п╦п╪п╣я─:

$ svn log foo.c
Б─╕
$ svn log http://foo.com/svn/trunk/code/foo.c
Б─╕

п▓ я─п╣п╥я┐п╩я▄я┌п╟я┌п╣ п╠я┐п╢я┐я┌ п©п╬п╨п╟п╥п╟п╫я▀ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦я▐ я┌п╬п╩я▄п╨п╬ п╢п╩я▐ я┌п╣я┘ п©я─п╟п╡п╬п╨, п╡ п╨п╬я┌п╬я─я▀я┘ п╦п╥п╪п╣п╫я▐п╩я│я▐ я─п╟п╠п╬я┤п╦п╧ я└п╟п╧п╩ (п╦п╩п╦ URL).

п∙я│п╩п╦ п╡п╟п╪ п╫я┐п╤п╫п╬ п╣я┴п╣ п╠п╬п╩я▄я┬п╣ п╦п╫я└п╬я─п╪п╟я├п╦п╦ п╬ я└п╟п╧п╩п╣ п╦п╩п╦ п╨п╟я┌п╟п╩п╬пЁп╣, я┌п╬ п╢п╩я▐ svn log п╣я│я┌я▄ п©п╟я─п╟п╪п╣я┌я─ --verbose (-v). п╒п╟п╨ п╨п╟п╨ Subversion п©п╬п╥п╡п╬п╩я▐п╣я┌ п©п╣я─п╣п╪п╣я┴п╟я┌я▄ п╦ п╨п╬п©п╦я─п╬п╡п╟я┌я▄ я└п╟п╧п╩я▀ п╦ п╨п╟я┌п╟п╩п╬пЁп╦, п╡п╟п╤п╫п╬ п╬я┌я│п╩п╣п╤п╦п╡п╟я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п©я┐я┌п╣п╧ п╡ я└п╟п╧п╩п╬п╡п╬п╧ я│п╦я│я┌п╣п╪п╣. п÷п╬я█я┌п╬п╪я┐ п╡ я─п╣п╤п╦п╪п╣ я─п╟я│я┬п╦я─п╣п╫п╫п╬пЁп╬ п╡я▀п╡п╬п╢п╟ svn log п╡п╨п╩я▌я┤п╟п╣я┌ п©п╣я─п╣я┤п╣п╫я▄ п╦п╥п╪п╣п╫п╣п╫п╫я▀я┘ п╡ п©я─п╟п╡п╨п╣ п©я┐я┌п╣п╧:

$ svn log -r 8 -v
------------------------------------------------------------------------
r8 | sally | 2002-07-14 08:15:29 -0500 | 1 line
Changed paths:
M /trunk/code/foo.c
M /trunk/code/bar.h
A /trunk/code/doc/README

Frozzled the sub-space winch.

------------------------------------------------------------------------

п я─п╬п╪п╣ я┌п╬пЁп╬, svn log п╦п╪п╣п╣я┌ п©п╟я─п╟п╪п╣я┌я─ --quiet (-q), я│п╬п╨я─п╟я┴п╟я▌я┴п╦п╧ п╩п╬пЁ я│п╬п╬п╠я┴п╣п╫п╦п╣. п÷я─п╦ п╣пЁп╬ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦п╦ я│ --verbose п╡я▀п╢п╟я▌я┌я│я▐ я┌п╬п╩я▄п╨п╬ п╦п╪п╣п╫п╟ п╦п╥п╪п╣п╫п╣п╫п╫я▀я┘ я└п╟п╧п╩п╬п╡.

$ svn log -r 2
------------------------------------------------------------------------
$

п═п╟п╫п╣п╣ п╪я▀ я┐п╤п╣ п©п╬п╥п╫п╟п╨п╬п╪п╦п╩п╦я│я▄ я│ svn diff Б─■ я█я┌п╟ п╨п╬п╪п╟п╫п╢п╟ п©п╬п╨п╟п╥я▀п╡п╟п╣я┌ я─п╟п╥п╩п╦я┤п╦я▐ я└п╟п╧п╩п╟ п╡ п╣п╢п╦п╫п╬п╪ я└п╬я─п╪п╟я┌п╣ п©я─п╣п╢я│я┌п╟п╡п╩п╣п╫п╦я▐ я─п╟п╥п╩п╦я┤п╦п╧; п╬п╫п╟ п╦я│п©п╬п╩я▄п╥я┐п╣я┌я│я▐ п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬ п╠я▀ п©п╬п╨п╟п╥п╟я┌я▄ п╩п╬п╨п╟п╩я▄п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╡п╫п╣я│п╣п╫п╫я▀п╣ п╡ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п©п╣я─п╣п╢ п╦я┘ я└п╦п╨я│п╟я├п╦п╣п╧ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣.

п▓п╬п╬п╠я┴п╣, я│я┐я┴п╣я│я┌п╡я┐п╣я┌ я┌я─п╦ п╡п╬п╥п╪п╬п╤п╫я▀я┘ п╡п╟я─п╦п╟п╫я┌п╟ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ svn diff:

$ svn diff
Index: rules.txt
===================================================================
--- rules.txt (revision 3)
+++ rules.txt (working copy)
@@ -1,4 +1,5 @@
 Be kind to others
 Freedom = Responsibility
 Everything in moderation
-Chew with your mouth open
+Chew with your mouth closed
+Listen when others are speaking
$

$ svn diff --revision 3 rules.txt
Index: rules.txt
===================================================================
--- rules.txt (revision 3)
+++ rules.txt (working copy)
@@ -1,4 +1,5 @@
 Be kind to others
 Freedom = Responsibility
 Everything in moderation
-Chew with your mouth open
+Chew with your mouth closed
+Listen when others are speaking
$

$ svn diff --revision 2:3 rules.txt
Index: rules.txt
===================================================================
--- rules.txt (revision 2)
+++ rules.txt (revision 3)
@@ -1,4 +1,4 @@
 Be kind to others
-Freedom = Chocolate Ice Cream
+Freedom = Responsibility
 Everything in moderation
 Chew with your mouth open
$

$ svn diff --revision 4:5 http://svn.red-bean.com/repos/example/trunk/text/rules.txt
Б─╕
$

п∙я│п╩п╦ п╡я▀ я┘п╬я┌п╦я┌п╣ п©я─п╬п╟п╫п╟п╩п╦п╥п╦я─п╬п╡п╟я┌я▄ я─п╟п╫п╫п╦п╣ п╡п╣я─я│п╦п╦ я└п╟п╧п╩п╟, п╟ п╫п╣ я─п╟п╥п╩п╦я┤п╦я▐ п╪п╣п╤п╢я┐ п╢п╡я┐п╪я▐ я└п╟п╧п╩п╟п╪п╦, п╪п╬п╤п╫п╬ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ svn cat:

$ svn cat --revision 2 rules.txt
Be kind to others
Freedom = Chocolate Ice Cream
Everything in moderation
Chew with your mouth open
$

п≤п╩п╦ п╡я▀ п╪п╬п╤п╣я┌п╣ п©п╣я─п╣п╫п╟п©я─п╟п╡п╦я┌я▄ п╡я▀п╡п╬п╢ п©я─я▐п╪п╬ п╡ я└п╟п╧п╩:

$ svn cat --revision 2 rules.txt > rules.txt.v2
$

п²п╟п╡п╣я─п╫п╬п╣, п╡п╟п╪ п╦п╫я┌п╣я─п╣я│п╫п╬, п©п╬я┤п╣п╪я┐ п╢п╩я▐ п╥п╟п╪п╣п╫я▀ я└п╟п╧п╩п╟ я│я┌п╟я─п╬п╧ п©я─п╟п╡п╨п╬п╧ п╪я▀ п╫п╣ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟п╩п╦я│я▄ svn update --revision. п∙я│я┌я▄ п╫п╣я│п╨п╬п╩я▄п╨п╬ п©я─п╦я┤п╦п╫, п©п╬ п╨п╬я┌п╬я─я▀п╪ п╫п╟п╪ п╬п╨п╟п╥п╟п╩п╬я│я▄ п©я─п╣п╢п©п╬я┤я┌п╦я┌п╣п╩я▄п╫п╣п╣ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ svn cat.

п▓п╬-п©п╣я─п╡я▀я┘, п╡я▀ п╪п╬пЁп╩п╦ п╥п╟я┘п╬я┌п╣я┌я▄ я┐п╡п╦п╢п╣я┌я▄ я─п╟п╥п╩п╦я┤п╦я▐ п╪п╣п╤п╢я┐ п╢п╡я┐п╪я▐ п©я─п╟п╡п╨п╟п╪п╦ п╬п╢п╫п╬пЁп╬ я└п╟п╧п╩п╟, п╦я│п©п╬п╩я▄п╥я┐я▐ п╡п╫п╣я┬п╫я▌я▌ п©я─п╬пЁя─п╟п╪п╪я┐ п©я─п╬я│п╪п╬я┌я─п╟ я─п╟п╥п╩п╦я┤п╦п╧ (п╡п╬п╥п╪п╬п╤п╫п╬, я│ пЁя─п╟я└п╦я┤п╣я│п╨п╦п╪ п╦п╫я┌п╣я─я└п╣п╧я│п╬п╪ п╦п╩п╦ я─п╟п╠п╬я┌п╟я▌я┴я┐я▌ я│ я└п╟п╧п╩п╟п╪п╦ я┌п╟п╨п╦я┘ я└п╬я─п╪п╟я┌п╬п╡, п╢п╩я▐ п╨п╬я┌п╬я─я▀я┘ п╣п╢п╦п╫я▀п╧ я└п╬я─п╪п╟я┌ п©я─п╣п╢я│я┌п╟п╡п╩п╣п╫п╦я▐ я─п╟п╥п╩п╦я┤п╦п╧ п╫п╣ п©я─п╦пЁп╬п╢п╣п╫). п▓ я█я┌п╬п╪ я│п╩я┐я┤п╟п╣ п╡п╟п╪ п╫я┐п╤п╫п╬ п╡я▀я┌п╟я┴п╦я┌я▄ п╨п╬п©п╦я▌ я│я┌п╟я─п╬п╧ п©я─п╟п╡п╨п╦, п©п╣я─п╣п╫п╟п©я─п╟п╡п╦я┌я▄ п╣п╣ п╡ я└п╟п╧п╩ п╦ п©п╣я─п╣п╢п╟я┌я▄ я█я┌п╬я┌ я└п╟п╧п╩ п╡п╪п╣я│я┌п╣ я│ я└п╟п╧п╩п╬п╪ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╡п╫п╣я┬п╫п╣п╧ п©я─п╬пЁя─п╟п╪п╪п╣ п©я─п╬я│п╪п╬я┌я─п╟ я─п╟п╥п╩п╦я┤п╦п╧.

п▓п╬-п╡я┌п╬я─я▀я┘, п╦п╫п╬пЁп╢п╟ п©я─п╬я┴п╣ п©п╬я│п╪п╬я┌я─п╣я┌я▄ п©п╬п╩п╫я┐я▌ я│я┌п╟я─я┐я▌ п╡п╣я─я│п╦я▌ я└п╟п╧п╩п╟ я┤п╣п╪ я─п╟п╥п╩п╦я┤п╦я▐ п╪п╣п╤п╢я┐ п╫п╦п╪ п╦ п╣пЁп╬ п╢я─я┐пЁп╬п╧ п©я─п╟п╡п╨п╬п╧.

п п╬п╪п╟п╫п╢п╟ svn list п©п╬п╨п╟п╥я▀п╡п╟п╣я┌ я│п╬п╢п╣я─п╤п╦п╪п╬п╣ п╨п╟я┌п╟п╩п╬пЁп╟ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣, п©я─п╦ я█я┌п╬п╪ п╫п╣ п╥п╟п╨п╟я┤п╦п╡п╟я▐ п╣пЁп╬ п╫п╟ п╩п╬п╨п╟п╩я▄п╫я┐я▌ п╪п╟я┬п╦п╫я┐:

$ svn list http://svn.collab.net/repos/svn
README
branches/
clients/
tags/
trunk/

п∙я│п╩п╦ п╡п╟п╪ п╫я┐п╤п╫п╟ п╠п╬п╩п╣п╣ п©п╬п╢я─п╬п╠п╫п╟я▐ п╦п╫я└п╬я─п╪п╟я├п╦я▐, п╡п╬я│п©п╬п╩я▄п╥я┐п╧я┌п╣я│я▄ я└п╩п╟пЁп╬п╪ --verbose (-v), п╦ п╡я▀ я┐п╡п╦п╢п╣я┌п╣ я┤я┌п╬-я┌п╬ п©п╬п╢п╬п╠п╫п╬п╣:

$ svn list --verbose http://svn.collab.net/repos/svn
   2755 harry          1331 Jul 28 02:07 README
   2773 sally               Jul 29 15:07 branches/
   2769 sally               Jul 29 12:07 clients/
   2698 harry               Jul 24 18:07 tags/
   2785 sally               Jul 29 19:07 trunk/

п п╬п╩п╬п╫п╨п╦ п©п╬п╨п╟п╥я▀п╡п╟я▌я┌ п©я─п╟п╡п╨я┐, п╡ п╨п╬я┌п╬я─п╬п╧ я└п╟п╧п╩ п╦п╩п╦ п╨п╟я┌п╟п╩п╬пЁ п©п╬я│п╩п╣п╢п╫п╦п╧ я─п╟п╥ п╦п╥п╪п╣п╫я▐п╩п╦я│я▄, п╦п╪я▐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐, п╡п╫п╬я│п╦п╡я┬п╣пЁп╬ п╦п╥п╪п╣п╫п╣п╫п╦я▐, я─п╟п╥п╪п╣я─ (п╣я│п╩п╦ я█я┌п╬ я└п╟п╧п╩), п╢п╟я┌я┐ п©п╬я│п╩п╣п╢п╫п╣пЁп╬ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╦ п╦п╪я▐ я█п╩п╣п╪п╣п╫я┌п╟.

п▓ п╢п╬п©п╬п╩п╫п╣п╫п╦п╣ п╨п╬ п╡я│п╣п╪ я┐п©п╬п╪я▐п╫я┐я┌я▀п╪ п╡я▀я┬п╣ п╨п╬п╪п╟п╫п╢п╟п╪, п╪п╬п╤п╫п╬ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ svn update п╦ svn checkout я│ п©п╟я─п╟п╪п╣я┌я─п╬п╪ --revision, я┤я┌п╬п╠я▀ п©п╣я─п╣п╪п╣я│я┌п╦я┌я▄ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ б╚п╫п╟п╥п╟п╢ п╡п╬ п╡я─п╣п╪п╣п╫п╦б╩^[12]:

$ svn checkout --revision 1729 # Checks out a new working copy at r1729
Б─╕
$ svn update --revision 1729 # Updates an existing working copy to r1729
Б─╕

п п╬пЁп╢п╟ Subversion п╦п╥п╪п╣п╫я▐п╣я┌ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ (п╦п╩п╦ п╩я▌п╠я┐я▌ п╦п╫я└п╬я─п╪п╟я├п╦я▌ п╡ п╬п╠п╩п╟я│я┌п╦ .svn), п╬п╫п╟ п©я▀я┌п╟п╣я┌я│я▐ п╢п╣п╩п╟я┌я▄ я█я┌п╬ п╨п╟п╨ п╪п╬п╤п╫п╬ п╠п╬п╩п╣п╣ п╬я│я┌п╬я─п╬п╤п╫п╬. п÷п╣я─п╣п╢ п╦п╥п╪п╣п╫п╣п╫п╦п╣п╪ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ Subversion п╥п╟п©п╦я│я▀п╡п╟п╣я┌ я│п╡п╬п╦ п╫п╟п╪п╣я─п╣п╫п╦я▐ п╡ п╩п╬пЁ-я└п╟п╧п╩. п≈п╟я┌п╣п╪ п╢п╩я▐ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐ п╥п╟п©я─п╬я┬п╣п╫п╫я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╬п╫п╟ п╡я▀п©п╬п╩п╫я▐п╣я┌ п╨п╬п╪п╟п╫п╢я▀ п╦п╥ п╩п╬пЁ-я└п╟п╧п╩п╟, я┐я│я┌п╟п╫п╟п╡п╩п╦п╡п╟я▐ п╠п╩п╬п╨п╦я─п╬п╡п╨я┐ я┌п╬п╧ я┤п╟я│я┌п╦ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, я│ п╨п╬я┌п╬я─п╬п╧ я─п╟п╠п╬я┌п╟п╣я┌ Б─■ я█я┌п╬ п╢п╣п╩п╟п╣я┌я│я▐ п╢п╩я▐ п©я─п╣п╢п╬я┌п╡я─п╟я┴п╣п╫п╦я▐ я─п╟п╠п╬я┌я▀ п╢я─я┐пЁп╦я┘ Subversion-п╨п╩п╦п╣п╫я┌п╬п╡ я│ я┌п╬п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╣п╧, п╨п╬я┌п╬я─п╟я▐ п╫п╟я┘п╬п╢п╦я┌я│я▐ п╡ п©я─п╬п╪п╣п╤я┐я┌п╬я┤п╫п╬п╪ я│п╬я│я┌п╬я▐п╫п╦п╦. п÷п╬я│п╩п╣ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐ п╥п╟п©я─п╬я┬п╣п╫я▀я┘ п╢п╣п╧я│я┌п╡п╦п╧ Subversion я┐п╢п╟п╩я▐п╣я┌ п╩п╬пЁ я└п╟п╧п╩. п░я─я┘п╦я┌п╣п╨я┌я┐я─п╫п╬ я█я┌п╬ п╫п╟п©п╬п╪п╦п╫п╟п╣я┌ п╤я┐я─п╫п╟п╩п╦я─я┐п╣п╪я┐я▌ я└п╟п╧п╩п╬п╡я┐я▌ я│п╦я│я┌п╣п╪я┐. п∙я│п╩п╦ я─п╟п╠п╬я┌п╟ Subversion п╠я▀п╩п╟ п©я─п╣я─п╡п╟п╫п╟ (п╡ я─п╣п╥я┐п╩я▄я┌п╟я┌п╣ я┌п╬пЁп╬, я┤я┌п╬ п©я─п╬я├п╣я│я│ п╠я▀п╩ я┐п╠п╦я┌ п╦п╩п╦, п╫п╟п©я─п╦п╪п╣я─, п╦п╥-п╥п╟ п╪п╟я┬п╦п╫п╫п╬пЁп╬ я│п╠п╬я▐), п╩п╬пЁ я└п╟п╧п╩я▀ п╬я│я┌п╟я▌я┌я│я▐ п╫п╟ п╢п╦я│п╨п╣. п÷п╣я─п╣п╥п╟п©я┐я│я┌п╦п╡ п╡я▀п©п╬п╩п╫п╣п╫п╦п╣ п╩п╬пЁ я└п╟п╧п╩п╬п╡, Subversion п╪п╬п╤п╣я┌ п╥п╟п╡п╣я─я┬п╦я┌я▄ п©я─п╣п╢п╡п╟я─п╦я┌п╣п╩я▄п╫п╬ п╫п╟я┤п╟я┌я▀п╣ п╬п©п╣я─п╟я├п╦п╦, п╦ я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ я│п╫п╬п╡п╟ п╡п╣я─п╫п╣я┌я│я▐ п╡ я│п╬пЁп╩п╟я│п╬п╡п╟п╫п╫п╬п╣ я│п╬я│я┌п╬я▐п╫п╦п╣.

п≤п╪п╣п╫п╫п╬ я█я┌п╬, я│п╬п╠я│я┌п╡п╣п╫п╫п╬, п╦ п╢п╣п╩п╟п╣я┌ svn cleanup: п╬п╫п╟ п╦я┴п╣я┌ п╡ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╦ п╡я▀п©п╬п╩п╫я▐п╣я┌ п╫п╣п╥п╟п╡п╣я─я┬п╣п╫п╫я▀п╣ п╩п╬пЁ-я└п╟п╧п╩я▀, я┐п╢п╟п╩я▐я▐ п©п╬ я┘п╬п╢я┐ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐ п╠п╩п╬п╨п╦я─п╬п╡п╨п╦ п╡ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦. п∙я│п╩п╦ Subversion п╨п╬пЁп╢п╟-п╫п╦п╠я┐п╢я▄ пЁп╬п╡п╬я─п╦п╩п╟ п╡п╟п╪ п╬ я┌п╬п╪, я┤я┌п╬ я┤п╟я│я┌я▄ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ б╚п╥п╟п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╟б╩, я┌п╬ п╡п╟п╪ п╫я┐п╤п╫п╬ п╥п╟п©я┐я│я┌п╦я┌я▄ я█я┌я┐ п╨п╬п╪п╟п╫п╢я┐. п я─п╬п╪п╣ я┌п╬пЁп╬, svn status п©п╬п╨п╟п╤п╣я┌ п╢п╩я▐ п╥п╟п╠п╩п╬п╨п╦я─п╬п╡п╟п╫п╫я▀я┘ я█п╩п╣п╪п╣п╫я┌п╬п╡ п╠я┐п╨п╡я┐ L:

$ svn status
  L    somedir
M      somedir/foo.c

$ svn cleanup
$ svn status
M      somedir/foo.c

п²п╣ п©я┐я┌п╟п╧я┌п╣ я█я┌п╦ п╠п╩п╬п╨п╦я─п╬п╡п╨п╦ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ я│ п╬п╠я▀я┤п╫я▀п╪п╦ п╠п╩п╬п╨п╦я─п╬п╡п╨п╟п╪п╦, п╨п╬я┌п╬я─я▀п╣ я┐я│я┌п╟п╫п╟п╡п╩п╦п╡п╟я▌я┌ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╦ Subversion, п╦я│п©п╬п╩я▄п╥я┐я▌я┴п╦п╣ п╪п╬п╢п╣п╩я▄ п╨п╬п╫п╨я┐я─п╣п╫я┌п╫п╬пЁп╬ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╡п╣я─я│п╦я▐п╪п╦ б╚п╠п╩п╬п╨п╦я─п╬п╡п╨п╟-п╦п╥п╪п╣п╫п╣п╫п╦п╣-я─п╟п╥п╠п╩п╬п╨п╦я─п╬п╡п╨п╟б╩; п╥п╟ п╠п╬п╩п╣п╣ п©п╬п╢я─п╬п╠п╫я▀п╪ п╬п©я─п╣п╢п╣п╩п╣п╫п╦п╣п╪ п╬п╠я─п╟я┌п╦я┌п╣я│я▄ п╨ Three meanings of б╚lockб╩

п п╬п╪п╟п╫п╢п╟ svn import Б─■ я█я┌п╬ п╠я▀я│я┌я─я▀п╧ я│п©п╬я│п╬п╠ я│п╨п╬п©п╦я─п╬п╡п╟я┌я▄ п╫п╣п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫п╬п╣ п╢п╣я─п╣п╡п╬ я└п╟п╧п╩п╬п╡ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣, cп╬п╥п╢п╟п╡п╟я▐ п©я─п╦ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬я│я┌п╦ п©п╬п╢п╨п╟я┌п╟п╩п╬пЁп╦.

$ svnadmin create /usr/local/svn/newrepos
$ svn import mytree file:///usr/local/svn/newrepos/some/project \
             -m "Initial import"
Adding         mytree/foo.c
Adding         mytree/bar.c
Adding         mytree/subdir
Adding         mytree/subdir/quux.h

Committed revision 1.

п▓ п©я─п╣п╢я▀п╢я┐я┴п╣п╪ п©я─п╦п╪п╣я─п╣ п╡я▀п©п╬п╩п╫я▐п╣я┌я│я▐ п╨п╬п©п╦я─п╬п╡п╟п╫п╦п╣ я│п╬п╢п╣я─п╤п╦п╪п╬пЁп╬ п╨п╟я┌п╟п╩п╬пЁп╟ mytree п╡ п╨п╟я┌п╟п╩п╬пЁ some/project я┘я─п╟п╫п╦п╩п╦я┴п╟:

$ svn list file:///usr/local/svn/newrepos/some/project
bar.c
foo.c
subdir/

п·п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ я┌п╬, я┤я┌п╬ п©п╬я│п╩п╣ п╥п╟п╡п╣я─я┬п╣п╫п╦я▐ п╦п╪п©п╬я─я┌п╟ п╬я─п╦пЁп╦п╫п╟п╩я▄п╫п╬п╣ п╢п╣я─п╣п╡п╬ я└п╟п╧п╩п╬п╡ п╫п╣ п╨п╬п╫п╡п╣я─я┌п╦я─я┐п╣я┌я│я▐ п╡ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌. п╖я┌п╬п╠я▀ п╫п╟я┤п╟я┌я▄ я─п╟п╠п╬я┌п╟я┌я▄, п╡п╟п╪ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ я│п╬п╥п╢п╟я┌я▄ п╫п╬п╡я┐я▌ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ (svn checkout) п╢п╣я─п╣п╡п╟ я└п╟п╧п╩п╬п╡.

п п╩п╦п╣п╫я┌ Subversion п©п╬п╫п╦п╪п╟п╣я┌ я─я▐п╢ п╨п╩я▌я┤п╣п╡я▀я┘ я│п╩п╬п╡. п╜я┌п╦ п╨п╩я▌я┤п╣п╡я▀п╣ я│п╩п╬п╡п╟ п╪п╬п╤п╫п╬ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╡п╪п╣я│я┌п╬ я├п╣п╩п╬я┤п╦я│п╩п╣п╫п╫я▀я┘ п╟я─пЁя┐п╪п╣п╫я┌п╬п╡ п╬п©я├п╦п╦ --revision, п©я─п╦ я█я┌п╬п╪ Subversion п©п╣я─п╣п╡п╣п╢п╣я┌ п╦я┘ п╡ п╨п╬п╫п╨я─п╣я┌п╫я▀п╣ п╫п╬п╪п╣я─п╟ п©я─п╟п╡п╬п╨:

п≤п╥ п╢п╟п╫п╫п╬пЁп╬ п╬п©п╦я│п╟п╫п╦я▐ п╪п╬п╤п╫п╬ я│п╢п╣п╩п╟я┌я▄ п╬я┤п╣п╡п╦п╢п╫я▀п╧ п╡я▀п╡п╬п╢ п╬ я┌п╬п╪, я┤я┌п╬ п╨п╩я▌я┤п╣п╡я▀п╣ я│п╩п╬п╡п╟ PREV, BASE, п╦ COMMITTED п╪п╬пЁя┐я┌ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ я┌п╬п╩я▄п╨п╬ п©я─п╦ я│я│я▀п╩п╨п╟я┘ п╫п╟ п©я┐я┌п╦ п╡ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦; п╬п╫п╦ п╫п╣ п©я─п╦п╪п╣п╫п╦п╪я▀ п╨ URL-п╟п╢я─п╣я│п╟п╪ я┘я─п╟п╫п╦п╩п╦я┴п╟. п²п╟п©я─п╬я┌п╦п╡, п╨п╩я▌я┤п╣п╡п╬п╣ я│п╩п╬п╡п╬ HEAD п╪п╬п╤п╫п╬ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ я│п╬п╡п╪п╣я│я┌п╫п╬ я│ п╬п╠п╬п╦п╪п╦ я┌п╦п©п╟п╪п╦ п©я┐я┌п╣п╧.

п²п╦п╤п╣ п©я─п╦п╡п╣п╢п╣п╫п╬ п╫п╣я│п╨п╬п╩я▄п╨п╬ п©я─п╦п╪п╣я─п╬п╡ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ п╨п╩я▌я┤п╣п╡я▀я┘ я│п╩п╬п╡ п©я─п╟п╡п╬п╨:

$ svn diff --revision PREV:COMMITTED foo.c

# п©п╬п╨п╟п╥п╟я┌я▄ п©п╬я│п╩п╣п╢п╫п╣п╣ п╦п╥п╪п╣п╫п╣п╫п╦п╣, п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟п╫п╫п╬п╣ п╢п╩я▐ foo.c

$ svn log --revision HEAD

# п©п╬п╨п╟п╥п╟я┌я▄ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╣ п╢п╩я▐ п©п╬я│п╩п╣п╢п╫п╣п╧ я└п╦п╨я│п╟я├п╦п╦ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣

$ svn diff --revision HEAD

# я│я─п╟п╡п╫п╦я┌я▄ п╡п╟я┬ я─п╟п╠п╬я┤п╦п╧ я└п╟п╧п╩ (я│ я┐я┤п╣я┌п╬п╪ п╩п╬п╨п╟п╩я▄п╫я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧)
# я│ п©п╬я│п╩п╣п╢п╫п╣п╧ п©я─п╟п╡п╨п╬п╧ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣

$ svn diff --revision BASE:HEAD foo.c

# я│я─п╟п╡п╫п╦я┌я▄ п╡п╟я┬ б╚п╦я│я┘п╬п╢п╫я▀п╧б╩ foo.c (п╠п╣п╥ я┐я┤п╣я┌п╟ п╩п╬п╨п╟п╩я▄п╫я▀я┘
# п╦п╥п╪п╣п╫п╣п╫п╦п╧) я│ п©п╬я│п╩п╣п╢п╫п╣п╧ п╡п╣я─я│п╦п╣п╧ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣

$ svn log --revision BASE:HEAD

# п©п╬п╨п╟п╥п╟я┌я▄ п╡я│п╣ п╩п╬пЁп╦ я└п╦п╨я│п╟я├п╦п╧ я│п╬ п╡я─п╣п╪п╣п╫п╦ п╡п╟я┬п╣пЁп╬ п©п╬я│п╩п╣п╢п╫п╣пЁп╬ п╬п╠п╫п╬п╡п╩п╣п╫п╦я▐

$ svn update --revision PREV foo.c

# п╬я┌п╪п╣п╫п╦я┌я▄ п©п╬я│п╩п╣п╢п╫п╦п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ foo.c, п©п╬п╫п╦п╥п╦п╡ я─п╟п╠п╬я┤я┐я▌ п©я─п╟п╡п╨я┐ foo.c
      
$ svn diff -r BASE:14 foo.c

# я│я─п╟п╡п╫п╦я┌я▄ п╫п╣п╦п╥п╪п╣п╫п╣п╫п╫я┐я▌ п╡п╣я─я│п╦я▌ foo.c п╦ п╡п╣я─я│п╦я▌ foo.c п╡ п©я─п╟п╡п╨п╣ 14

п²п╬п╪п╣я─п╟ п©я─п╟п╡п╬п╨ п╫п╣ п╫п╣я│я┐я┌ п╫п╦п╨п╟п╨п╬п╧ п╦п╫я└п╬я─п╪п╟я├п╦п╦ п╬п╠ п╬п╨я─я┐п╤п╟я▌я┴п╣п╪ п╪п╦я─п╣ п╥п╟ п©я─п╣п╢п╣п╩п╟п╪п╦ я│п╦я│я┌п╣п╪я▀ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╡п╣я─я│п╦я▐п╪п╦, я┌п╬пЁп╢п╟ п╨п╟п╨ п╡п╟п╪ п╦п╫п╬пЁп╢п╟ я┌я─п╣п╠я┐п╣я┌я│я▐ я│п╬п©п╬я│я┌п╟п╡п╦я┌я▄ п╪п╬п╪п╣п╫я┌ п╡я─п╣п╪п╣п╫п╦ п╡ я─п╣п╟п╩я▄п╫п╬п╧ п╤п╦п╥п╫п╦ я│ п╪п╬п╪п╣п╫я┌п╬п╪ п╡ п╦я│я┌п╬я─п╦п╦ п╡п╣я─я│п╦п╧. п╖я┌п╬п╠я▀ п©п╬п╪п╬я┤я▄ п╡п╟п╪ п╡ я█я┌п╬п╪, п╬п©я├п╦я▐ --revision п╢п╬п©я┐я│п╨п╟п╣я┌ я┐п╨п╟п╥п╟п╫п╦п╣ п╢п╟я┌я▀, п╨п╬я┌п╬я─я┐я▌ п╥п╟п╨п╩я▌я┤п╟я▌я┌ п╡ я└п╦пЁя┐я─п╫я▀п╣ я│п╨п╬п╠п╨п╦ ({ п╦ }). Subversion п©я─п╦п╫п╦п╪п╟п╣я┌ п╢п╟я┌я┐ п╦ п╡я─п╣п╪я▐ п╡ я└п╬я─п╪п╟я┌п╣, я│п╬п╬я┌п╡п╣я┌я│я┌п╡я┐я▌я┴п╣п╪ я│я┌п╟п╫п╢п╟я─я┌я┐ ISO-8601, п╟ я┌п╟п╨п╤п╣ п╡ п╫п╣п╨п╬я┌п╬я─я▀я┘ п╢я─я┐пЁп╦я┘. п²п╦п╤п╣ п©я─п╦п╡п╣п╢п╣п╫п╬ п╫п╣я│п╨п╬п╩я▄п╨п╬ п©я─п╦п╪п╣я─п╬п╡. (п²п╣ п╥п╟п╠я▀п╡п╟п╧я┌п╣ п╠я─п╟я┌я▄ п╡ п╨п╟п╡я▀я┤п╨п╦ п╩я▌п╠я▀п╣ п╢п╟я┌я▀, я│п╬п╢п╣я─п╤п╟я┴п╦п╣ п©я─п╬п╠п╣п╩я▀.)

$ svn checkout -r {2006-02-17}
$ svn checkout -r {15:30}
$ svn checkout -r {15:30:00.200000}
$ svn checkout -r {"2006-02-17 15:30"}
$ svn checkout -r {"2006-02-17 15:30 +0230"}
$ svn checkout -r {2006-02-17T15:30}
$ svn checkout -r {2006-02-17T15:30Z}
$ svn checkout -r {2006-02-17T15:30-04:00}
$ svn checkout -r {20060217T1530}
$ svn checkout -r {20060217T1530Z}
$ svn checkout -r {20060217T1530-0500}
Б─╕

п п╬пЁп╢п╟ п╡я▀ я┐п╨п╟п╥я▀п╡п╟п╣я┌п╣ п╢п╟я┌я┐, Subversion п╫п╟я┘п╬п╢п╦я┌ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ п╫п╟п╦п╠п╬п╩п╣п╣ п╠п╩п╦п╥п╨я┐я▌ п╨ п╫п╣п╧ п©я─п╟п╡п╨я┐, п©п╬я│п╩п╣ я┤п╣пЁп╬ п©я─п╬п╢п╬п╩п╤п╟п╣я┌ я─п╟п╠п╬я┌я┐ я│ п╡я▀я┤п╦я│п╩п╣п╫п╫я▀п╪ п╫п╬п╪п╣я─п╬п╪ п©я─п╟п╡п╨п╦.

$ svn log -r {2006-11-28}
------------------------------------------------------------------------
r12 | ira | 2006-11-27 12:31:51 -0600 (Mon, 27 Nov 2006) | 6 lines
Б─╕

п╒п╟п╨п╤п╣ п╡я▀ п╪п╬п╤п╣я┌п╣ п╥п╟п╢п╟п╡п╟я┌я▄ п╢п╦п╟п©п╟п╥п╬п╫я▀ п╢п╟я┌. Subversion п╫п╟п╧п╢п╣я┌ п╡я│п╣ п©я─п╟п╡п╨п╦ п╪п╣п╤п╢я┐ п╬п╠п╣п╦п╪п╦ п╢п╟я┌п╟п╪п╦ п╡п╨п╩я▌я┤п╦я┌п╣п╩я▄п╫п╬:

$ svn log -r {2006-11-20}:{2006-11-29}
Б─╕

п▓п╫п╦п╪п╟п╫п╦п╣

п▓я─п╣п╪п╣п╫п╫я▀п╣ п╪п╣я┌п╨п╦ п©я─п╟п╡п╬п╨ я│п╬я┘я─п╟п╫я▐я▌я┌я│я▐ п╨п╟п╨ п╦я┘ п╫п╣п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫я▀п╣ п╦п╥п╪п╣п╫я▐п╣п╪я▀п╣ я│п╡п╬п╧я│я┌п╡п╟ (я│п╪. б╚п║п╡п╬п╧я│я┌п╡п╟б╩ ). п≤я│я┘п╬п╢я▐ п╦п╥ я█я┌п╬пЁп╬, п╦п╥п╪п╣п╫п╣п╫п╦п╣п╪ п╡я─п╣п╪п╣п╫п╫я▀я┘ п╪п╣я┌п╬п╨ п╪п╬п╤п╫п╬ п╩п╣пЁп╨п╬ п╦я│п╨п╟п╥п╦я┌я▄ п╦я│я┌п╦п╫п╫я┐я▌ я┘я─п╬п╫п╬п╩п╬пЁп╦я▌, п╦п╩п╦ п╢п╟п╤п╣ я┐п╢п╟п╩п╦я┌я▄ я│п╬п╡я│п╣п╪ п╦п╫я└п╬я─п╪п╟я├п╦я▌ п╬ п╡я─п╣п╪п╣п╫п╦ п©я─п╟п╡п╨п╦. п╜я┌п╬ п╪п╬п╤п╣я┌ п©я─п╦п╡п╣я│я┌п╦ п╨ п╫п╣п╬п╤п╦п╢п╟п╫п╫я▀п╪ я─п╣п╥я┐п╩я▄я┌п╟я┌п╟п╪ п©я─п╦ п╡п╫я┐я┌я─п╣п╫п╫п╣п╪ п©я─п╣п╬п╠я─п╟п╥п╬п╡п╟п╫п╦п╦ п╢п╟я┌ п╡ п╫п╬п╪п╣я─п╟ п©я─п╟п╡п╬п╨, п╡я▀п©п╬п╩п╫я▐п╣п╪п╬п╪ Subversion.

п≤я┌п╟п╨, Subversion п╦я│п©п╬п╩я▄п╥я┐п╣я┌ я│п╡п╬п╧я│я┌п╡п╟, я┤я┌п╬п╠я▀ я┘я─п╟п╫п╦я┌я▄ п╢п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫я┐я▌ п╦п╫я└п╬я─п╪п╟я├п╦я▌ я└п╟п╧п╩п╟я┘, п╨п╟я┌п╟п╩п╬пЁп╟я┘ п╦ п©я─п╟п╡п╨п╟я┘. п▓я▀ п╪п╬п╤п╣я┌п╣ п╫п╟п╧я┌п╦ я│п╡п╬п╧я│я┌п╡п╟п╪ п╟п╫п╟п╩п╬пЁп╦я┤п╫п╬п╣ п©я─п╦п╪п╣п╫п╣п╫п╦п╣. п²п╟п╩п╦я┤п╦п╣ п╪п╣я│я┌п╟ я─я▐п╢п╬п╪ я│ п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫я▀п╪п╦ п╢п╟п╫п╫я▀п╪п╦, п╡ п╨п╬я┌п╬я─п╬п╪ п╪п╬п╤п╫п╬ я┘я─п╟п╫п╦я┌я▄ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄я│п╨п╦п╣ п╪п╣я┌п╟п╢п╟п╫п╫я▀п╣ п╬п╠ я█я┌п╦я┘ п╢п╟п╫п╫я▀я┘, п╪п╬п╤п╣я┌ п©я─п╦пЁп╬п╢п╦я┌я▄я│я▐ п╢п╩я▐ п©п╬п╢п╢п╣я─п╤п╨п╦ п╡п╟я┬п╦я┘ я─п╣пЁп╩п╟п╪п╣п╫я┌п╬п╡ я─п╟п╠п╬я┌я▀ я│ п╨п╬п╢п╬п╪, п╦п╩п╦, п╡п╬п╥п╪п╬п╤п╫п╬, п╢п╩я▐ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ п╨п╟п╨п╦п╪п╦-я┌п╬ п╢п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫я▀п╪п╦ я┐я┌п╦п╩п╦я┌п╟п╪п╦.

п■п╬п©я┐я│я┌п╦п╪, п╡я▀ я─п╟п╥я─п╟п╠п╟я┌я▀п╡п╟п╣я┌п╣ п╡п╣п╠-я│п╟п╧я┌, я│п╬п╢п╣я─п╤п╟я┴п╦п╧ п╪п╫п╬пЁп╬ я├п╦я└я─п╬п╡я▀я┘ я└п╬я┌п╬пЁя─п╟я└п╦п╧ п╦ п©п╬п╨п╟п╥я▀п╡п╟я▌я┴п╦п╧ п╦я┘ я│ п©п╬п╢п©п╦я│я▐п╪п╦ п╦ п╢п╟я┌п╬п╧. п²п╟п╠п╬я─ я█я┌п╦я┘ я└п╬я┌п╬пЁя─п╟я└п╦п╧ п©п╬я│я┌п╬я▐п╫п╫п╬ п╦п╥п╪п╣п╫я▐п╣я┌я│я▐, п©п╬я█я┌п╬п╪я┐ я│п╟п╧я┌ п╫я┐п╤п╫п╬ п©п╬ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌п╦ п╪п╟п╨я│п╦п╪п╟п╩я▄п╫п╬ п╟п╡я┌п╬п╪п╟я┌п╦п╥п╦я─п╬п╡п╟я┌я▄. п╓п╬я┌п╬пЁя─п╟я└п╦п╦ п╪п╬пЁя┐я┌ п╠я▀я┌я▄ п╠п╬п╩я▄я┬п╬пЁп╬ я─п╟п╥п╪п╣я─п╟, п©п╬я█я┌п╬п╪я┐, п╨п╟п╨ п╬п╠я▀я┤п╫п╬ п╢п╣п╩п╟я▌я┌ п╫п╟ я┌п╟п╨п╦я┘ я│п╟п╧я┌п╟я┘, п©п╬я│п╣я┌п╦я┌п╣п╩я▐п╪ п©п╬я┌я─п╣п╠я┐п╣я┌я│я▐ п©п╬п╨п╟п╥я▀п╡п╟я┌я▄ п╪п╦п╫п╦п╟я┌я▌я─я▀ п╦п╥п╬п╠я─п╟п╤п╣п╫п╦п╧.

п╜я┌я┐ п╥п╟п╢п╟я┤я┐ п╪п╬п╤п╫п╬ я─п╣я┬п╦я┌я▄ я│ п©п╬п╪п╬я┴я▄я▌ п╬п╠я▀я┤п╫я▀я┘ я└п╟п╧п╩п╬п╡. п═я▐п╢п╬п╪, п╡ п╬п╢п╫п╬п╪ п╨п╟я┌п╟п╩п╬пЁп╣, п╡я▀ п╪п╬п╤п╣я┌п╣ п╦п╪п╣я┌я▄ я└п╟п╧п╩я▀ image123.jpg п╦ image123-thumbnail.jpg. п∙я│п╩п╦ п╡п╟п╤п╫п╬ я│п╬я┘я─п╟п╫п╦я┌я▄ п╬я─п╦пЁп╦п╫п╟п╩я▄п╫п╬п╣ п╦п╪я▐ я└п╟п╧п╩п╟, п╪п╦п╫п╦п╟я┌я▌я─я▀ п╪п╬пЁя┐я┌ я─п╟п╥п╪п╣я┴п╟я┌я▄я│я▐ п╡ п╬я┌п╢п╣п╩я▄п╫п╬п╪ п╨п╟я┌п╟п╩п╬пЁп╣ (п╫п╟п©я─п╦п╪п╣я─, thumbnails/image123.jpg). п╒п╟п╨п╦п╪ п╤п╣ п╬п╠я─п╟п╥п╬п╪, п╬я┌п╢п╣п╩я▄п╫п╬ п╬я┌ п╬я│п╫п╬п╡п╫п╬пЁп╬ пЁя─п╟я└п╦я┤п╣я│п╨п╬пЁп╬ я└п╟п╧п╩п╟, п╪п╬п╤п╫п╬ я┘я─п╟п╫п╦я┌я▄ п╬п©п╦я│п╟п╫п╦п╣ п╦ п╢п╟я┌я┐. п÷я─п╬п╠п╩п╣п╪п╟ п╥п╟п╨п╩я▌я┤п╟п╣я┌я│я▐ п╡ я┌п╬п╪, я┤я┌п╬ я└п╟п╧п╩п╬п╡п╟я▐ я│я┌я─я┐п╨я┌я┐я─п╟ п╠я┐п╢п╣я┌ я│п╦п╩я▄п╫п╬ я─п╟п╥я─п╟я│я┌п╟я┌я▄я│я▐ п©я─п╦ п╨п╟п╤п╢п╬п╪ п╢п╬п╠п╟п╡п╩п╣п╫п╦п╦ я└п╬я┌п╬пЁя─п╟я└п╦п╦ п╫п╟ я│п╟п╧я┌.

п╒п╣п©п╣я─я▄ п©я─п╣п╢я│я┌п╟п╡п╦п╪, п╨п╟п╨ п╪п╬п╤п╫п╬ п╬я─пЁп╟п╫п╦п╥п╬п╡п╟я┌я▄ я─п╟п╠п╬я┌я┐ я┌п╬пЁп╬ п╤п╣ п╡п╣п╠-я│п╟п╧я┌п╟, п╦я│п©п╬п╩я▄п╥я┐я▐ Subversion-я│п╡п╬п╧я│я┌п╡п╟ я└п╟п╧п╩п╬п╡. п■п╬п©я┐я│я┌п╦п╪, п╦п╪п╣п╣я┌я│я▐ я└п╟п╧п╩ image123.jpg п╦ я┐ я█я┌п╬пЁп╬ я└п╟п╧п╩п╟ я┐я│я┌п╟п╫п╬п╡п╩п╣п╫я▀ я│п╡п╬п╧я│я┌п╡п╟ caption, datestamp п╦ п╢п╟п╤п╣ thumbnail. п▓ я█я┌п╬п╪ я│п╩я┐я┤п╟п╣ я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ п╡я▀пЁп╩я▐п╢п╦я┌ пЁп╬я─п╟п╥п╢п╬ п╫п╟пЁп╩я▐п╢п╫п╣п╣. п╓п╟п╨я┌п╦я┤п╣я│п╨п╦, п╬п╫п╟ п╡я▀пЁп╩я▐п╢п╦я┌ я┌п╟п╨, п╨п╟п╨ п╠я┐п╢я┌п╬ я│п╬п╢п╣я─п╤п╦я┌ я┌п╬п╩я▄п╨п╬ я│п╟п╪п╦ пЁя─п╟я└п╦я┤п╣я│п╨п╦п╣ я└п╟п╧п╩я▀, п╦ п╫п╦я┤п╣пЁп╬ п╠п╬п╩я▄я┬п╣. п·п╢п╫п╟п╨п╬ п╡п╟я┬п╦ я│п╨я─п╦п©я┌я▀ п╟п╡я┌п╬п╪п╟я┌п╦п╥п╟я├п╦п╦ п╥п╫п╟я▌я┌, я┤я┌п╬ я│ п©п╬п╪п╬я┴я▄я▌ svn (п╟ п╣я┴п╣ п╩я┐я┤я┬п╣ я▐п╥я▀п╨п╬п╡п╬п╧ п╬п╠п╡я▐п╥п╨п╦ Subversion Б─■ я│п╪. б╚Using Languages Other than C and C++б╩) п╪п╬п╤п╫п╬ п©п╬п╩я┐я┤п╦я┌я▄ п╢п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫я┐я▌, п╫п╣п╬п╠я┘п╬п╢п╦п╪я┐я▌ п╢п╩я▐ п©п╬п╨п╟п╥п╟ п╫п╟ я│п╟п╧я┌п╣ п╦п╫я└п╬я─п╪п╟я├п╦я▌, п╫п╣ п╥п╟п╫п╦п╪п╟я▐я│я▄ я┤я┌п╣п╫п╦п╣п╪ п╦п╫п╢п╣п╨я│п╫п╬пЁп╬ я└п╟п╧п╩п╟ п╦п╩п╦ п╪п╟п╫п╦п©я┐п╩я▐я├п╦я▐п╪п╦ я│ п©я┐я┌я▐п╪п╦.

п²п╣ п╪п╣п╫п╣п╣ я┤п╟я│я┌п╬ п╦я│п©п╬п╩я▄п╥я┐я▌я┌я│я▐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄я│п╨п╦п╣ я│п╡п╬п╧я│я┌п╡п╟ п©я─п╟п╡п╬п╨. п·п╢п╫п╦п╪ п╦п╥ я┌п╦п©п╦я┤п╫я▀я┘ п©я─п╦п╪п╣я─п╬п╡ я▐п╡п╩я▐п╣я┌я│я▐ я│п╡п╬п╧я│я┌п╡п╬, я┘я─п╟п╫я▐я┴п╣п╣ ID п╥п╟п©п╦я│п╦ п╡ я┌я─п╣п╨п╣я─п╣, я│ п╨п╬я┌п╬я─п╬п╧ я│п╬п©п╬я│я┌п╟п╡п╩п╣п╫п╟ п╢п╟п╫п╫п╟я▐ п©я─п╟п╡п╨п╟ Б─■ п╫п╟п©я─п╦п╪п╣я─, п©п╬я┌п╬п╪я┐ я┤я┌п╬ п╡п╫п╣я│п╣п╫п╫я▀п╣ п╡ п©я─п╟п╡п╨п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╦я│п©я─п╟п╡п╩я▐я▌я┌ п╬я┬п╦п╠п╨я┐, п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟п╫п╫я┐я▌ п╡ я┌я─п╣п╨п╣я─п╣ я│ п╢п╟п╫п╫я▀п╪ ID. п■я─я┐пЁп╦п╣ п╡п╟я─п╦п╟п╫я┌я▀ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ я│п╡п╬п╧я│я┌п╡ п©я─п╟п╡п╬п╨ Б─■ п╥п╟п╢п╟п╫п╦п╣ п©я─п╟п╡п╨п╣ п╠п╬п╩п╣п╣ я│п╬п╢п╣я─п╤п╟я┌п╣п╩я▄п╫п╬пЁп╬ п╦п╪п╣п╫п╦. п²п╣п╩п╣пЁп╨п╬ п╥п╟п©п╬п╪п╫п╦я┌я▄, я┤я┌п╬, п╨ п©я─п╦п╪п╣я─я┐, п©я─п╟п╡п╨п╟ 1935 п©п╬п╩п╫п╬я│я┌я▄я▌ п©я─п╬я┌п╣я│я┌п╦я─п╬п╡п╟п╫п╟! п∙я│п╩п╦ п╤п╣, я│п╨п╟п╤п╣п╪, п╥п╟п╢п╟я┌я▄ я│п╡п╬п╧я│я┌п╡я┐ я─п╣п╥я┐п╩я▄я┌п╟я┌я▀ я┌п╣я│я┌п╦я─п╬п╡п╟п╫п╦я▐ п╡ я█я┌п╬п╧ п©я─п╟п╡п╨п╣ п╥п╫п╟я┤п╣п╫п╦п╣ п©я─п╬п╧п╢п╣п╫я▀ п╡я│п╣ я┌п╣я│я┌я▀, п©п╬п╩я┐я┤п╦я┌я│я▐ п╟п╠я│п╬п╩я▌я┌п╫п╬ я┤п╣я┌п╨п╟я▐ п╦п╫я└п╬я─п╪п╟я├п╦я▐.

Issue(s): IZ2376, IZ1919
Reviewed by:  sally

This fixes a nasty segfault in the wort frabbing process
Б─╕

п п╬п╪п╟п╫п╢п╟ svn п©я─п╣п╢п╬я│я┌п╟п╡п╩я▐п╣я┌ п╫п╣я│п╨п╬п╩я▄п╨п╬ я│п©п╬я│п╬п╠п╬п╡ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▐ п╦п╩п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ я│п╡п╬п╧я│я┌п╡ я└п╟п╧п╩п╬п╡ п╦ п╨п╟я┌п╟п╩п╬пЁп╬п╡. п╖я┌п╬п╠я▀ п╢п╬п╠п╟п╡п╦я┌я▄ я│п╡п╬п╧я│я┌п╡п╬ я│ п╨п╬я─п╬я┌п╨п╦п╪ я┤п╦я┌п╟п╣п╪я▀п╪ п╥п╫п╟я┤п╣п╫п╦п╣п╪, п╫п╟п╡п╣я─п╫п╬п╣, п©я─п╬я┴п╣ п╡я│п╣пЁп╬ я┐п╨п╟п╥п╟я┌я▄ п╣пЁп╬ п╦п╪я▐ п╦ п╥п╫п╟я┤п╣п╫п╦п╣ п╡ п╨п╬п╪п╟п╫п╢п╫п╬п╧ я│я┌я─п╬п╨п╣ п©п╬п╢п╨п╬п╪п╟п╫п╢я▀ propset.

$ svn propset copyright '(c) 2006 Red-Bean Software' calc/button.c
property 'copyright' set on 'calc/button.c'
$

п·п╢п╫п╟п╨п╬ п╪я▀ я┐п╤п╣ п╥п╫п╟п╣п╪ п╬ я┌п╬п╪, п╫п╟я│п╨п╬п╩я▄п╨п╬ пЁп╦п╠п╨п╦п╪п╦ п╪п╬пЁя┐я┌ п╠я▀я┌я▄ я│п╡п╬п╧я│я┌п╡п╟ Subversion. п≤ п╣я│п╩п╦ п╡п╟п╪ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п╥п╟п╢п╟я┌я▄ я│п╡п╬п╧я│я┌п╡я┐ п╪п╫п╬пЁп╬я│я┌я─п╬я┤п╫п╬п╣ я┌п╣п╨я│я┌п╬п╡п╬п╣ п╦п╩п╦ п╢п╟п╤п╣ п╠п╦п╫п╟я─п╫п╬п╣ п╥п╫п╟я┤п╣п╫п╦п╣, п©п╣я─п╣п╢п╟п╡п╟я┌я▄ п╣пЁп╬ я┤п╣я─п╣п╥ п╨п╬п╪п╟п╫п╢п╫я┐я▌ я│я┌я─п╬п╨я┐ п╠я┐п╢п╣я┌ п╫п╣я┐п╢п╬п╠п╫п╬. п■п╩я▐ я┌п╟п╨п╦я┘ я│п╩я┐я┤п╟п╣п╡ п╨п╬п╪п╟п╫п╢п╟ propset п╦п╪п╣п╣я┌ п©п╟я─п╟п╪п╣я┌я─ --file (-F), п©п╬п╥п╡п╬п╩я▐я▌я┴п╦п╧ я┐п╨п╟п╥п╟я┌я▄ п╦п╪я▐ я└п╟п╧п╩п╟ я│ п╫п╬п╡я▀п╪ п╥п╫п╟я┤п╣п╫п╦п╣п╪ я│п╡п╬п╧я│я┌п╡п╟.

$ svn propset license -F /path/to/LICENSE calc/button.c
property 'license' set on 'calc/button.c'
$

п²п╟ п╦п╪п╣п╫п╟ я│п╡п╬п╧я│я┌п╡ п╫п╟п╨п╩п╟п╢я▀п╡п╟п╣я┌я│я▐ я─я▐п╢ п╬пЁя─п╟п╫п╦я┤п╣п╫п╦п╧. п≤п╪я▐ п╢п╬п╩п╤п╫п╬ п╫п╟я┤п╦п╫п╟я┌я▄я│я▐ я│ п╠я┐п╨п╡я▀, п╢п╡п╬п╣я┌п╬я┤п╦я▐ (:) п╦п╩п╦ п©п╬п╢я┤п╣я─п╨п╦п╡п╟п╫п╦я▐ (_); п©п╬я│п╩п╣ п╫п╦я┘ п╪п╬п╤п╫п╬ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ я├п╦я└я─я▀, я┌п╦я─п╣ (-) п╦ я┌п╬я┤п╨п╦ (.). ^[13]

п я─п╬п╪п╣ п╨п╬п╪п╟п╫п╢я▀ propset, svn п©я─п╣п╢п╩п╟пЁп╟п╣я┌ п╨п╬п╪п╟п╫п╢я┐ propedit. п╜я┌п╟ п╨п╬п╪п╟п╫п╢п╟ п╦я│п©п╬п╩я▄п╥я┐п╣я┌ п╢п╩я▐ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▐ п╦п╩п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐ я│п╡п╬п╧я│я┌п╡п╟ п╥п╟п╢п╟п╫п╫я┐я▌ п©я─п╬пЁя─п╟п╪п╪я┐-я─п╣п╢п╟п╨я┌п╬я─ (я│п╪. б╚Configб╩). п÷я─п╦ п╡я▀п©п╬п╩п╫п╣п╫п╦п╦ п╨п╬п╪п╟п╫п╢я▀ svn п╡я▀п╥я▀п╡п╟п╣я┌ я─п╣п╢п╟п╨я┌п╬я─ я│ п╡я─п╣п╪п╣п╫п╫я▀п╪ я└п╟п╧п╩п╬п╪, я│п╬п╢п╣я─п╤п╟я┴п╦п╪ я┌п╣п╨я┐я┴п╣п╣ п╥п╫п╟я┤п╣п╫п╦п╣ я│п╡п╬п╧я│я┌п╡п╟ (п╦п╩п╦ я│ п©я┐я│я┌я▀п╪ я└п╟п╧п╩п╬п╪, п╣я│п╩п╦ п╢п╬п╠п╟п╡п╩я▐п╣я┌я│я▐ п╫п╬п╡п╬п╣ я│п╡п╬п╧я│я┌п╡п╬). п≈п╟я┌п╣п╪ п╡я▀ п©я─п╬я│я┌п╬ п╦п╥п╪п╣п╫я▐п╣я┌п╣ п╡ я─п╣п╢п╟п╨я┌п╬я─п╣ п╥п╫п╟я┤п╣п╫п╦п╣, п©п╬п╨п╟ п╬п╫п╬ п╫п╣ я│я┌п╟п╫п╣я┌ я┌п╟п╨п╦п╪, п╨п╟п╨п╦п╪ п╡я▀ я┘п╬я┌п╣п╩п╦ п╠я▀ п╣пЁп╬ п╡п╦п╢п╣я┌я▄, я│п╬я┘я─п╟п╫я▐п╣я┌п╣ п╡я─п╣п╪п╣п╫п╫я▀п╧ я└п╟п╧п╩ п╦ п╡я▀я┘п╬п╢п╦я┌п╣ п╦п╥ я─п╣п╢п╟п╨я┌п╬я─п╟. п∙я│п╩п╦ Subversion п╬п╠п╫п╟я─я┐п╤п╦я┌, я┤я┌п╬ п╡я▀ п╢п╣п╧я│я┌п╡п╦я┌п╣п╩я▄п╫п╬ п╦п╥п╪п╣п╫п╦п╩п╦ я│я┐я┴п╣я│я┌п╡я┐я▌я┴п╣п╣ п╥п╫п╟я┤п╣п╫п╦п╣ я│п╡п╬п╧я│я┌п╡п╟, п╠я┐п╢п╣я┌ п╥п╟п©п╦я│п╟п╫п╬ п╫п╬п╡п╬п╣ п╥п╫п╟я┤п╣п╫п╦п╣. п∙я│п╩п╦ п╡я▀ п╡я▀я┬п╩п╦ п╦п╥ я─п╣п╢п╟п╨я┌п╬я─п╟, п╫п╣ п╡п╫п╣я│я▐ п╫п╦п╨п╟п╨п╦я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧, п╪п╬п╢п╦я└п╦п╨п╟я├п╦п╦ я│п╡п╬п╧я│я┌п╡п╟ п╫п╣ п©я─п╬п╦п╥п╬п╧п╢п╣я┌.

$ svn propedit copyright calc/button.c  ### exit the editor without changes
No changes to property 'copyright' on 'calc/button.c'
$

п·п╠я─п╟я┴п╟п╣п╪ п╡п╟я┬п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ я┌п╬, я┤я┌п╬, п©п╬п╢п╬п╠п╫п╬ п╢я─я┐пЁп╦п╪ п╨п╬п╪п╟п╫п╢п╟п╪ svn, п╨п╬п╪п╟п╫п╢я▀, п╬я┌п╫п╬я│я▐я┴п╦п╣я│я▐ п╨ я│п╡п╬п╧я│я┌п╡п╟п╪, п╪п╬пЁя┐я┌ п©я─п╦п╪п╣п╫я▐я┌я▄я│я▐ п╨ п╫п╣я│п╨п╬п╩я▄п╨п╦п╪ п©я┐я┌я▐п╪ п╥п╟ я─п╟п╥. п╜я┌п╬ п╢п╟п╣я┌ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п╬п╢п╫п╬п╧ п╨п╬п╪п╟п╫п╢п╬п╧ п╦п╥п╪п╣п╫я▐я┌я▄ я│п╡п╬п╧я│я┌п╡п╟ я├п╣п╩п╬пЁп╬ п╫п╟п╠п╬я─п╟ я└п╟п╧п╩п╬п╡. п²п╟п©я─п╦п╪п╣я─, п╪п╬п╤п╫п╬ я│п╢п╣п╩п╟я┌я▄ п╡п╬я┌ я┌п╟п╨:

$ svn propset copyright '(c) 2006 Red-Bean Software' calc/*
property 'copyright' set on 'calc/Makefile'
property 'copyright' set on 'calc/button.c'
property 'copyright' set on 'calc/integer.c'
Б─╕
$

п▓я│п╣ я█я┌п╦ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▐ п╦ я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟п╫п╦я▐ я│п╡п╬п╧я│я┌п╡ п╠я▀п╩п╦ п╠я▀ п╫п╣ я│п╩п╦я┬п╨п╬п╪ п©п╬п╩п╣п╥п╫я▀, п╣я│п╩п╦ п╠я▀ п╫п╣п╩я▄п╥я▐ п╠я▀п╩п╬ п©я─п╬я│я┌п╬ я┐п╥п╫п╟я┌я▄ п╥п╫п╟я┤п╣п╫п╦п╣ я│п╡п╬п╧я│я┌п╡п╟. п╖я┌п╬п╠я▀ п©п╬я│п╪п╬я┌я─п╣я┌я▄ п╦п╪п╣п╫п╟ п╦ п╥п╫п╟я┤п╣п╫п╦я▐ я│п╡п╬п╧я│я┌п╡, п╥п╟п╢п╟п╫п╫я▀я┘ п╢п╩я▐ я└п╟п╧п╩п╬п╡ п╦ п╨п╟я┌п╟п╩п╬пЁп╬п╡, п╡ svn п╣я│я┌я▄ п╢п╡п╣ п©п╬п╢п╨п╬п╪п╟п╫п╢я▀. п п╬п╪п╟п╫п╢п╟ svn proplist п©п╣я─п╣я┤п╦я│п╩я▐п╣я┌ я│я┐я┴п╣я│я┌п╡я┐я▌я┴п╦п╣ п╢п╩я▐ я┐п╨п╟п╥п╟п╫п╫п╬пЁп╬ п©я┐я┌п╦ я│п╡п╬п╧я│я┌п╡п╟. п÷п╬я│п╩п╣ я┌п╬пЁп╬ п╨п╟п╨ п╡я▀ я┐п╥п╫п╟п╣я┌п╣ п╦п╪я▐ я│п╡п╬п╧я│я┌п╡п╟, я│ п©п╬п╪п╬я┴я▄я▌ svn propget п╪п╬п╤п╫п╬ п╥п╟п©я─п╬я│п╦я┌я▄ п╣пЁп╬ п╥п╫п╟я┤п╣п╫п╦п╣. п╜я┌п╟ п╨п╬п╪п╟п╫п╢п╟ п╡я▀п╡п╣п╢п╣я┌ п╡ я│я┌п╟п╫п╢п╟я─я┌п╫я▀п╧ п©п╬я┌п╬п╨ п╡п╡п╬п╢п╟-п╡я▀п╡п╬п╢п╟ п╥п╫п╟я┤п╣п╫п╦п╣ я│п╡п╬п╧я│я┌п╡п╟ п╢п╩я▐ я█п╩п╣п╪п╣п╫я┌п╟ п©п╬ я┐п╨п╟п╥п╟п╫п╫п╬п╪я┐ п©я┐я┌п╦ (п╦п╩п╦ п©я┐я┌я▐п╪) п╦ я│ я┐п╨п╟п╥п╟п╫п╫я▀п╪ п╦п╪п╣п╫п╣п╪.

$ svn proplist calc/button.c
Properties on 'calc/button.c':
  copyright
  license
$ svn propget copyright calc/button.c
(c) 2006 Red-Bean Software

п║я┐я┴п╣я│я┌п╡я┐п╣я┌ п╢п╟п╤п╣ п╡п╟я─п╦п╟п╫я┌ п╨п╬п╪п╟п╫п╢я▀ proplist, п©п╣я─п╣я┤п╦я│п╩я▐я▌я┴п╦п╧ п╨п╟п╨ п╦п╪п╣п╫п╟, я┌п╟п╨ п╦ п╥п╫п╟я┤п╣п╫п╦я▐ я│п╡п╬п╧я│я┌п╡. п²я┐п╤п╫п╬ п©я─п╬я│я┌п╬ п╢п╬п╠п╟п╡п╦я┌я▄ п©п╟я─п╟п╪п╣я┌я─ --verbose (-v).

$ svn proplist --verbose calc/button.c
Properties on 'calc/button.c':
  copyright : (c) 2006 Red-Bean Software
  license : ================================================================
Copyright (c) 2006 Red-Bean Software.  All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions, and the recipe for Fitz's famous
red-beans-and-rice.
Б─╕

п÷п╬я│п╩п╣п╢п╫я▐я▐ п╨п╬п╪п╟п╫п╢п╟, п╬я┌п╫п╬я│я▐я┴п╟я▐я│я▐ п╨ я│п╡п╬п╧я│я┌п╡п╟п╪ Б─■ propdel. п²п╣я│п╪п╬я┌я─я▐ п╫п╟ я┌п╬, я┤я┌п╬ Subversion п©п╬п╥п╡п╬п╩я▐п╣я┌ я│п╬я┘я─п╟п╫я▐я┌я▄ я│п╡п╬п╧я│я┌п╡п╟ я│ п©я┐я│я┌я▀п╪п╦ п╥п╫п╟я┤п╣п╫п╦я▐п╪п╦, п©п╬п╩п╫п╬я│я┌я▄я▌ я┐п╢п╟п╩п╦я┌я▄ я│п╡п╬п╧я│я┌п╡п╬ я│ п©п╬п╪п╬я┴я▄я▌ propedit п╦п╩п╦ propset п╫п╣п╩я▄п╥я▐. п²п╟п©я─п╦п╪п╣я─, я┌п╟п╨п╟я▐ п╨п╬п╪п╟п╫п╢п╟ п╫п╣ п╢п╟я│я┌ п╤п╣п╩п╟п╣п╪п╬пЁп╬ я█я└я└п╣п╨я┌п╟:

$ svn propset license '' calc/button.c
property 'license' set on 'calc/button.c'
$ svn proplist --verbose calc/button.c
Properties on 'calc/button.c':
  copyright : (c) 2006 Red-Bean Software
  license :
$

п■п╩я▐ п©п╬п╩п╫п╬пЁп╬ я┐п╢п╟п╩п╣п╫п╦я▐ я│п╡п╬п╧я│я┌п╡ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ п©п╬п╢п╨п╬п╪п╟п╫п╢п╬п╧ propdel. п∙п╣ я│п╦п╫я┌п╟п╨я│п╦я│ я┌п╟п╨п╬п╧ п╤п╣, п╨п╟п╨ п╦ я┐ п╢я─я┐пЁп╦я┘ п╨п╬п╪п╟п╫п╢ п╢п╩я▐ я─п╟п╠п╬я┌я▀ я│п╬ я│п╡п╬п╧я│я┌п╡п╟п╪п╦:

$ svn propdel license calc/button.c
property 'license' deleted from 'calc/button.c'.
$ svn proplist --verbose calc/button.c
Properties on 'calc/button.c':
  copyright : (c) 2006 Red-Bean Software
$

п÷п╬п╪п╫п╦я┌п╣, п╪я▀ пЁп╬п╡п╬я─п╦п╩п╦ п╬ п╫п╣п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫я▀я┘ я│п╡п╬п╧я│я┌п╡п╟я┘ п©я─п╟п╡п╬п╨? п≤я┘ я┌п╬п╤п╣ п╪п╬п╤п╫п╬ п╦п╥п╪п╣п╫я▐я┌я▄ я│ п©п╬п╪п╬я┴я▄я▌ svn. п÷я─п╬я│я┌п╬ п╢п╬п╠п╟п╡я▄я┌п╣ п©п╟я─п╟п╪п╣я┌я─ п╨п╬п╪п╟п╫п╢п╫п╬п╧ я│я┌я─п╬п╨п╦ --revprop п╦ я┐п╨п╟п╤п╦я┌п╣ п©я─п╟п╡п╨я┐, я│п╡п╬п╧я│я┌п╡п╬ п╨п╬я┌п╬я─п╬п╧ п╡я▀ я┘п╬я┌п╦я┌п╣ п╦п╥п╪п╣п╫п╦я┌я▄. п÷п╬я│п╨п╬п╩я▄п╨я┐ п©я─п╟п╡п╨п╦ пЁп╩п╬п╠п╟п╩я▄п╫я▀, я┐п╨п╟п╥я▀п╡п╟я┌я▄ п©я┐я┌п╦ п╫п╣ я┌я─п╣п╠я┐п╣я┌я│я▐ п╢п╬ я┌п╣я┘ п©п╬я─, п©п╬п╨п╟ п╡я▀ п╫п╟я┘п╬п╢п╦я┌п╣я│я▄ п╡ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ я┌п╬пЁп╬ я┘я─п╟п╫п╦п╩п╦я┴п╟, я│п╡п╬п╧я│я┌п╡п╬ п©я─п╟п╡п╨п╦ п╡ п╨п╬я┌п╬я─п╬п╪ п╡п╟п╪ п╫я┐п╤п╫п╬ п╦п╥п╪п╣п╫п╦я┌я▄. п▓ п©я─п╬я┌п╦п╡п╫п╬п╪ я│п╩я┐я┤п╟п╣, п╫я┐п╤п╫п╬ п©я─п╬я│я┌п╬ я┐п╨п╟п╥п╟я┌я▄ URL п╩я▌п╠п╬пЁп╬ п©я┐я┌п╦ п╡ п╦п╫я┌п╣я─п╣я│я┐я▌я┴п╣п╪ п╡п╟я│ я┘я─п╟п╫п╦п╩п╦я┴п╣ (п╡ я┌п╬п╪ я┤п╦я│п╩п╣ я█я┌п╬ п╪п╬п╤п╣я┌ п╠я▀я┌я▄ п╦ п╨п╬я─п╫п╣п╡п╬п╧ URL я┘я─п╟п╫п╦п╩п╦я┴п╟). п²п╟п©я─п╦п╪п╣я─, п╡я▀ п╪п╬п╤п╣я┌п╣ п╥п╟п╪п╣п╫п╦я┌я▄ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╣ я└п╦п╨я│п╟я├п╦п╦ п╡ я│я┐я┴п╣я│я┌п╡я┐я▌я┴п╣п╧ п©я─п╟п╡п╨п╣. ^[14] п∙я│п╩п╦ я┌п╣п╨я┐я┴п╦п╧ я─п╟п╠п╬я┤п╦п╧ п╨п╟я┌п╟п╩п╬пЁ я▐п╡п╩я▐п╣я┌я│я▐ я┤п╟я│я┌я▄я▌ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ я┘я─п╟п╫п╦п╩п╦я┴п╟, п╪п╬п╤п╫п╬ п©я─п╬я│я┌п╬ п╡я▀п©п╬п╩п╫п╦я┌я▄ п╨п╬п╪п╟п╫п╢я┐ svn propset, п╫п╣ я┐п╨п╟п╥я▀п╡п╟я▐ я├п╣п╩п╣п╡п╬п╧ п©я┐я┌я▄:

$ svn propset svn:log '* button.c: Fix a compiler warning.' -r11 --revprop
property 'svn:log' set on repository revision '11'
$

п²п╬ п╢п╟п╤п╣ п╣я│п╩п╦ п╡я▀ п╫п╣ п╡я▀пЁя─я┐п╤п╟п╩п╦ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п╪п╬п╤п╫п╬ п╦п╥п╪п╣п╫п╦я┌я▄ я│п╡п╬п╧я│я┌п╡п╬, я┐п╨п╟п╥п╟п╡ п╨п╬я─п╫п╣п╡п╬п╧ URL я┘я─п╟п╫п╦п╩п╦я┴п╟:

$ svn propset svn:log '* button.c: Fix a compiler warning.' -r11 --revprop \
              http://svn.example.com/repos/project
property 'svn:log' set on repository revision '11'
$

п·п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ я┌п╬, я┤я┌п╬ п╦п╥п╪п╣п╫п╣п╫п╦п╣ я█я┌п╦я┘ п╫п╣п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫я▀я┘ я│п╡п╬п╧я│я┌п╡ п╢п╬п╩п╤п╫п╬ п╠я▀я┌я▄ я▐п╡п╫п╬ я─п╟п╥я─п╣я┬п╣п╫п╬ п╟п╢п╪п╦п╫п╦я│я┌я─п╟я┌п╬я─п╬п╪ (я│п╪. б╚Hook Scriptsб╩). пёя┤п╦я┌я▀п╡п╟я▐ я┌п╬, я┤я┌п╬ я│п╡п╬п╧я│я┌п╡п╟ п╫п╣ п╡п╣я─я│п╦п╬п╫п╦я─я┐я▌я┌я│я▐, п©я─п╦ п╫п╣п╟п╨п╨я┐я─п╟я┌п╫п╬п╪ я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟п╫п╦п╦ п╡я▀ я─п╦я│п╨я┐п╣я┌п╣ п©п╬я┌п╣я─я▐я┌я▄ п╦п╫я└п╬я─п╪п╟я├п╦я▌. п╖я┌п╬п╠я▀ п©я─п╣п╢п╬я┌п╡я─п╟я┌п╦я┌я▄ п©п╬я┌п╣я─я▌ п╦п╫я└п╬я─п╪п╟я├п╦п╦, п╟п╢п╪п╦п╫п╦я│я┌я─п╟я┌п╬я─ я┘я─п╟п╫п╦п╩п╦я┴п╟ п╪п╬п╤п╣я┌ п©я─п╦п╫я▐я┌я▄ п╪п╣я─я▀ п©я─п╣п╢п╬я│я┌п╬я─п╬п╤п╫п╬я│я┌п╦, п╦ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌ п╦п╥п╪п╣п╫п╣п╫п╦п╣ п╫п╣п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫я▀я┘ я│п╡п╬п╧я│я┌п╡ п╥п╟п©я─п╣я┴п╣п╫п╬.

п÷п╬п╢я│п╨п╟п╥п╨п╟

п÷п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐п╪ я│п╩п╣п╢я┐п╣я┌, п©п╬ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌п╦, п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ svn propedit п╡п╪п╣я│я┌п╬ svn propset. п╔п╬я┌я▐ п╨п╬п╫п╣я┤п╫я▀п╧ я─п╣п╥я┐п╩я▄я┌п╟я┌ п╬п╠п╣п╦я┘ п╨п╬п╪п╟п╫п╢ п╠я┐п╢п╣я┌ п╬п╢п╦п╫п╟п╨п╬п╡, п©п╣я─п╡п╟я▐ п©п╬п╥п╡п╬п╩п╦я┌ я┐п╡п╦п╢п╣я┌я▄ я┌п╣п╨я┐я┴п╣п╣ п╥п╫п╟я┤п╣п╫п╦п╣ я│п╡п╬п╧я│я┌п╡п╟ п©п╣я─п╣п╢ п╦п╥п╪п╣п╫п╣п╫п╦п╣п╪, п╦ я┌п╟п╨п╦п╪ п╬п╠я─п╟п╥п╬п╪ я┐п╢п╬я│я┌п╬п╡п╣я─п╦я┌я▄я│я▐, я┤я┌п╬ п╡п╫п╬я│я▐я┌я│я▐ п╦п╪п╣п╫п╫п╬ я┌п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╨п╬я┌п╬я─я▀п╣ п╠я▀п╩п╦ п╥п╟п╢я┐п╪п╟п╫я▀. п▓ п╬я│п╬п╠п╣п╫п╫п╬я│я┌п╦ я█я┌п╬ я│п©я─п╟п╡п╣п╢п╩п╦п╡п╬ п╢п╩я▐ п╪п╬п╢п╦я└п╦п╨п╟я├п╦п╦ п╫п╣п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫я▀я┘ я│п╡п╬п╧я│я┌п╡ п©я─п╟п╡п╬п╨. п■п╟ п╦ п╦п╥п╪п╣п╫я▐я┌я▄ я│п╡п╬п╧я│я┌п╡п╟ я│ п╪п╫п╬пЁп╬я│я┌я─п╬я┤п╫я▀п╪п╦ п╥п╫п╟я┤п╣п╫п╦я▐п╪п╦ пЁп╬я─п╟п╥п╢п╬ п©я─п╬я┴п╣ п╡ я┌п╣п╨я│я┌п╬п╡п╬п╪ я─п╣п╢п╟п╨я┌п╬я─п╣, п╟ п╫п╣ п╡ п╨п╬п╪п╟п╫п╢п╫п╬п╧ я│я┌я─п╬п╨п╣.

п╒п╣п©п╣я─я▄, п╨п╬пЁп╢п╟ п╡я▀ п©п╬п╥п╫п╟п╨п╬п╪п╦п╩п╦я│я▄ я│п╬ п╡я│п╣п╪п╦ п╨п╬п╪п╟п╫п╢п╟п╪п╦ svn, п╦п╪п╣я▌я┴п╦п╪п╦ п╬я┌п╫п╬я┬п╣п╫п╦п╣ п╨ я│п╡п╬п╧я│я┌п╡п╟п╪, п╢п╟п╡п╟п╧я┌п╣ п©п╬я│п╪п╬я┌я─п╦п╪, п╨п╟п╨ п╦п╥п╪п╣п╫п╣п╫п╦я▐ я│п╡п╬п╧я│я┌п╡ п╡п╩п╦я▐я▌я┌ п╫п╟ п©я─п╦п╡я▀я┤п╫я▀п╧ п©п╬я─я▐п╢п╬п╨ я─п╟п╠п╬я┌я▀ я│ Subversion. п п╟п╨ п╪я▀ я┐п╤п╣ пЁп╬п╡п╬я─п╦п╩п╦, я│п╡п╬п╧я│я┌п╡п╟ я└п╟п╧п╩п╬п╡ п╦ п╨п╟я┌п╟п╩п╬пЁп╬п╡ п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫я▀ п╟п╫п╟п╩п╬пЁп╦я┤п╫п╬ я│п╬п╢п╣я─п╤п╦п╪п╬п╪я┐ я└п╟п╧п╩п╬п╡. п÷п╬я█я┌п╬п╪я┐ Subversion п©я─п╣п╢п╬я│я┌п╟п╡п╩я▐п╣я┌ я┌п╣ п╤п╣ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌п╦ п©п╬ я│п╩п╦я▐п╫п╦я▌ Б─■ п╡ я│п╩я┐я┤п╟п╣ п╨п╬п╫я└п╩п╦п╨я┌п╫я▀я┘ я│п╦я┌я┐п╟я├п╦п╧ Б─■ я┤я┐п╤п╦я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧ я│ п╡п╟я┬п╦п╪п╦ я│п╬п╠я│я┌п╡п╣п╫п╫я▀п╪п╦.

п╒п╟п╨ п╤п╣ п╨п╟п╨ п╦ п╡ я│п╩я┐я┤п╟п╣ я│ я│п╬п╢п╣я─п╤п╦п╪я▀п╪ я└п╟п╧п╩п╬п╡, п╦п╥п╪п╣п╫п╣п╫п╦я▐ я│п╡п╬п╧я│я┌п╡ я▐п╡п╩я▐я▌я┌я│я▐ п╩п╬п╨п╟п╩я▄п╫п╬п╧ п╪п╬п╢п╦я└п╦п╨п╟я├п╦п╣п╧ п╦ я│я┌п╟п╫п╬п╡я▐я┌я│я▐ п©п╬я│я┌п╬я▐п╫п╫я▀п╪п╦ я┌п╬п╩я▄п╨п╬ п©я─п╦ п╦я┘ я└п╦п╨я│п╟я├п╦п╦ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ я│ п©п╬п╪п╬я┴я▄я▌ svn commit. п≤п╥п╪п╣п╫п╣п╫п╦п╣ я│п╡п╬п╧я│я┌п╡ п╪п╬п╤п╫п╬ п╩п╣пЁп╨п╬ п╬я┌п╪п╣п╫п╦я┌я▄ Б─■ п╨п╬п╪п╟п╫п╢п╟ svn revert п╡п╬я│я│я┌п╟п╫п╬п╡п╦я┌ я└п╟п╧п╩я▀ п╦ п╨п╟я┌п╟п╩п╬пЁп╦ п╡ п╦я┘ п©п╣я─п╡п╬п╫п╟я┤п╟п╩я▄п╫п╬п╣ я│п╬я│я┌п╬я▐п╫п╦п╣, п╡п╨п╩я▌я┤п╟я▐ я│п╬п╢п╣я─п╤п╦п╪п╬п╣, я│п╡п╬п╧я│я┌п╡п╟ п╦ п╡я│п╣ п╬я│я┌п╟п╩я▄п╫п╬п╣. п я─п╬п╪п╣ я┌п╬пЁп╬, п╦п╫я┌п╣я─п╣я│п╫я┐я▌ п╦п╫я└п╬я─п╪п╟я├п╦я▌ п╬ я│п╬я│я┌п╬я▐п╫п╦п╦ я│п╡п╬п╧я│я┌п╡ я└п╟п╧п╩п╬п╡ п╦ п╨п╟я┌п╟п╩п╬пЁп╬п╡ п╪п╬п╤п╫п╬ п©п╬п╩я┐я┤п╦я┌я▄ я│ п©п╬п╪п╬я┴я▄я▌ п╨п╬п╪п╟п╫п╢ svn status п╦ svn diff.

$ svn status calc/button.c
 M     calc/button.c
$ svn diff calc/button.c
Property changes on: calc/button.c
___________________________________________________________________
Name: copyright
   + (c) 2006 Red-Bean Software

$

п·п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ я┌п╬, я┤я┌п╬ п©п╬п╢п╨п╬п╪п╟п╫п╢п╟ status п©п╬п╨п╟п╥п╟п╩п╟ M п╫п╣ п╡ п©п╣я─п╡п╬п╧, п╟ п╡п╬ п╡я┌п╬я─п╬п╧ п╨п╬п╩п╬п╫п╨п╣. п╜я┌п╬ п©я─п╬п╦п╥п╬я┬п╩п╬ п©п╬я┌п╬п╪я┐, я┤я┌п╬ п╡ calc/button.c п╦п╥п╪п╣п╫п╦п╩п╦я│я▄ я│п╡п╬п╧я│я┌п╡п╟, п╟ п╫п╣ я┌п╣п╨я│я┌п╬п╡п╬п╣ я│п╬п╢п╣я─п╤п╦п╪п╬п╣. п∙я│п╩п╦ п╠я▀ п╪я▀ п╦п╥п╪п╣п╫п╦п╩п╦ п╦ я┌п╬ п╦ п╢я─я┐пЁп╬п╣, п╡ п©п╣я─п╡п╬п╧ п╨п╬п╩п╬п╫п╨п╣ я┌п╟п╨п╤п╣ я│я┌п╬я▐п╩п╟ п╠я▀ п╠я┐п╨п╡п╟ M (я│п╪. б╚svn statusб╩).

% svn update calc
M  calc/Makefile.in
 C calc/button.c
Updated to revision 143.
$

$ svn status calc
 C     calc/button.c
?      calc/button.c.prej
$ cat calc/button.c.prej
prop 'linecount': user set to '1256', but update set to '1301'.
$

п я─п╬п╪п╣ я┌п╬пЁп╬, п╫я┐п╤п╫п╬ п©п╬п╪п╫п╦я┌я▄ п╬ п╫п╣я│я┌п╟п╫п╢п╟я─я┌п╫п╬п╪ п©п╬п╢я┘п╬п╢п╣, п╦я│п©п╬п╩я▄п╥я┐п╣п╪п╬п╪ Subversion п©я─п╦ п╡я▀п╡п╬п╢п╣ я─п╟п╥п╩п╦я┤п╦п╧ п╢п╩я▐ я│п╡п╬п╧я│я┌п╡. п▒п╣п╥я┐я│п╩п╬п╡п╫п╬, п╪п╬п╤п╫п╬ п╥п╟п©я┐я│я┌п╦я┌я▄ svn diff п╦ п©п╣я─п╣п╫п╟п©я─п╟п╡п╦я┌я▄ п╡я▀п╡п╬п╢ п╢п╩я▐ я│п╬п╥п╢п╟п╫п╦я▐ я─п╟п╠п╬я┌п╬я│п©п╬я│п╬п╠п╫п╬пЁп╬ п©п╟я┌я┤-я└п╟п╧п╩п╟. п²п╬ п©я─п╬пЁя─п╟п╪п╪п╟ patch п╠я┐п╢п╣я┌ п©я─п╬я│я┌п╬ п╦пЁп╫п╬я─п╦я─п╬п╡п╟я┌я▄ я─п╟п╥п╩п╦я┤п╦я▐ я│п╡п╬п╧я│я┌п╡ Б─■ п╨п╟п╨ п©я─п╟п╡п╦п╩п╬, п╬п╫п╟ п╦пЁп╫п╬я─п╦я─я┐п╣я┌ п╩я▌п╠п╬п╧ п╪я┐я│п╬я─, п╨п╬я┌п╬я─я▀п╧ п╫п╣ п╪п╬п╤п╣я┌ п╬п╠я─п╟п╠п╬я┌п╟я┌я▄. п  я│п╬п╤п╟п╩п╣п╫п╦я▌, я█я┌п╬ п╬п╥п╫п╟я┤п╟п╣я┌, я┤я┌п╬ п╢п╩я▐ п©п╬п╩п╫п╬пЁп╬ п©я─п╦п╪п╣п╫п╣п╫п╦я▐ п©п╟я┌я┤п╟, я│пЁп╣п╫п╣я─п╦я─п╬п╡п╟п╫п╫п╬пЁп╬ svn diff, п╦п╥п╪п╣п╫п╣п╫п╦я▐ я│п╡п╬п╧я│я┌п╡ п©я─п╦п╢п╣я┌я│я▐ п╡п╫п╬я│п╦я┌я▄ п╡я─я┐я┤п╫я┐я▌.

п÷п╬п╢п╢п╣я─п╤п╨п╟ я│п╡п╬п╧я│я┌п╡ Б─■ п╪п╬я┴п╫п╟я▐ я└я┐п╫п╨я├п╦п╬п╫п╟п╩я▄п╫п╟я▐ п╬я│п╬п╠п╣п╫п╫п╬я│я┌я▄ Subversion. п║п╡п╬п╧я│я┌п╡п╟ я│п╩я┐п╤п╟я┌ п╠п╟п╥п╬п╡я▀п╪ п╪п╣я┘п╟п╫п╦п╥п╪п╬п╪ п╢п╩я▐ я─п╣п╟п╩п╦п╥п╟я├п╦п╦ п╪п╫п╬пЁп╦я┘ п╢я─я┐пЁп╦я┘ я└я┐п╫п╨я├п╦п╧ Subversion, п╬п╠я│я┐п╤п╢п╟п╣п╪я▀я┘ п╡ п╨п╫п╦пЁп╣ Б─■ п©п╬п╢п╢п╣я─п╤п╨п╦ я┌п╣п╨я│я┌п╬п╡п╬пЁп╬ п©п╬п╦я│п╨п╟ я─п╟п╥п╩п╦я┤п╦п╧ п╦ я│п╩п╦я▐п╫п╦я▐, п©п╬п╢я│я┌п╟п╫п╬п╡п╨п╦ п╨п╩я▌я┤п╣п╡я▀я┘ я│п╩п╬п╡, я┌я─п╟п╫я│п╩я▐я├п╦п╦ я│п╦п╪п╡п╬п╩п╬п╡ п©п╣я─п╣п╡п╬п╢п╟ я│я┌я─п╬п╨п╦ п╦ я┌. п╢. п·п╢п╫п╟п╨п╬, я┤я┌п╬п╠я▀ п©п╬п╩я┐я┤п╦я┌я▄ я─п╣п╟п╩я▄п╫я┐я▌ п╡я▀пЁп╬п╢я┐ п╬я┌ я│п╡п╬п╧я│я┌п╡, п╦я┘ п╫я┐п╤п╫п╬ п╥п╟п╢п╟п╡п╟я┌я▄ п╢п╩я▐ я│п╬п╬я┌п╡п╣я┌я│я┌п╡я┐я▌я┴п╦я┘ я└п╟п╧п╩п╬п╡ п╦ п╨п╟я┌п╟п╩п╬пЁп╬п╡. п  я│п╬п╤п╟п╩п╣п╫п╦я▌, я│я─п╣п╢п╦ п©п╬п╡я│п╣п╢п╫п╣п╡п╫я▀я┘ п╥п╟п╠п╬я┌ п╬п╠ я█я┌п╬п╪ п╬я┤п╣п╫я▄ п╩п╣пЁп╨п╬ п╥п╟п╠я▀я┌я▄, п╬я│п╬п╠п╣п╫п╫п╬ я┐я┤п╦я┌я▀п╡п╟я▐ я┌п╬, я┤я┌п╬ п╫п╣я┐я│я┌п╟п╫п╬п╡п╨п╟ п╥п╫п╟я┤п╣п╫п╦я▐ я│п╡п╬п╧я│я┌п╡п╟ п╬п╠я▀я┤п╫п╬ п╫п╣ п©я─п╦п╡п╬п╢п╦я┌ п╨ я▐п╡п╫п╬ п╥п╟п╪п╣я┌п╫я▀п╪ п╬я┬п╦п╠п╨п╟п╪ (п©п╬ я│я─п╟п╡п╫п╣п╫п╦я▌, я│п╨п╟п╤п╣п╪, я│ п╫п╣п╢п╬п╠п╟п╡п╩п╣п╫п╦п╣п╪ я└п╟п╧п╩п╟ п©п╬п╢ п╡п╣я─я│п╦п╬п╫п╫я▀п╧ п╨п╬п╫я┌я─п╬п╩я▄). п╖я┌п╬п╠я▀ п©п╬п╪п╬я┤я▄ п╡ я┐я│я┌п╟п╫п╬п╡п╨п╣ я│п╡п╬п╧я│я┌п╡ п╢п╩я▐ п╫я┐п╤п╫я▀я┘ я█п╩п╣п╪п╣п╫я┌п╬п╡, Subversion п╬п╠п╣я│п©п╣я┤п╦п╡п╟п╣я┌ п©п╟я─я┐ п©я─п╬я│я┌я▀я┘, п╫п╬ п©п╬п╩п╣п╥п╫я▀я┘ я└я┐п╫п╨я├п╦п╧.

п÷я─п╦ п╨п╟п╤п╢п╬п╪ п╢п╬п╠п╟п╡п╩п╣п╫п╦п╦ я└п╟п╧п╩п╟ п©п╬п╢ п╡п╣я─я│п╦п╬п╫п╫я▀п╧ п╨п╬п╫я┌я─п╬п╩я▄ я│ п©п╬п╪п╬я┴я▄я▌ п╨п╬п╪п╟п╫п╢ svn add п╦п╩п╦ svn import Subversion п©я▀я┌п╟п╣я┌я│я▐ п╟п╡я┌п╬п╪п╟я┌п╦я┤п╣я│п╨п╦ я┐я│я┌п╟п╫п╬п╡п╦я┌я▄ п╫п╣я│п╨п╬п╩я▄п╨п╬ п╠п╟п╥п╬п╡я▀я┘ я│п╡п╬п╧я│я┌п╡ я└п╟п╧п╩п╬п╡. п▓п╬-п©п╣я─п╡я▀я┘, п╡ п╬п©п╣я─п╟я├п╦п╬п╫п╫я▀я┘ я│п╦я│я┌п╣п╪п╟я┘, я└п╟п╧п╩п╬п╡я▀п╣ я│п╦я│я┌п╣п╪я▀ п╨п╬я┌п╬я─я▀я┘ п©п╬п╢п╢п╣я─п╤п╦п╡п╟я▌я┌ п╠п╦я┌ я─п╟п╥я─п╣я┬п╣п╫п╦я▐ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐, Subversion п╟п╡я┌п╬п╪п╟я┌п╦я┤п╣я│п╨п╦ п╥п╟п╢п╟п╣я┌ я│п╡п╬п╧я│я┌п╡п╬ svn:executable п╢п╩я▐ п╡п╫п╬п╡я▄ п╢п╬п╠п╟п╡п╩п╣п╫п╫я▀я┘ п╦п╩п╦ п╦п╪п©п╬я─я┌п╦я─п╬п╡п╟п╫п╫я▀я┘ я└п╟п╧п╩п╬п╡, я┐ п╨п╬я┌п╬я─я▀я┘ я█я┌п╬я┌ п╠п╦я┌ я┐я│я┌п╟п╫п╬п╡п╩п╣п╫. (п·п╠я─п╟я┌п╦я┌п╣я│я▄ п╨ б╚п≤я│п©п╬п╩п╫п╦п╪п╬я│я┌я▄ я└п╟п╧п╩п╟б╩ п╥п╟ п╢п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫п╬п╧ п╦п╫я└п╬я─п╪п╟я├п╦п╦ п╬п╠ я█я┌п╬п╪ я│п╡п╬п╧я│я┌п╡п╣.) п▓п╬-п╡я┌п╬я─я▀я┘, Subversion п╡я▀п©п╬п╩п╫я▐п╣я┌ п╬я┤п╣п╫я▄ п©я─п╬я│я┌я┐я▌ я█п╡я─п╦я│я┌п╦я┤п╣я│п╨я┐я▌ п©я─п╬я├п╣п╢я┐я─я┐, я┤я┌п╬п╠я▀ п╬п©я─п╣п╢п╣п╩п╦я┌я▄, п╦п╪п╣п╣я┌ п╩п╦ я└п╟п╧п╩ я┤п╦я┌п╟п╣п╪п╬п╣ я│п╬п╢п╣я─п╤п╦п╪п╬п╣. п∙я│п╩п╦ я█я┌п╬ п╫п╣ я┌п╟п╨, Subversion п╟п╡я┌п╬п╪п╟я┌п╦я┤п╣я│п╨п╦ я┐я│я┌п╟п╫п╟п╡п╩п╦п╡п╟п╣я┌ я│п╡п╬п╧я│я┌п╡п╬ svn:mime-type я█я┌п╬пЁп╬ я└п╟п╧п╩п╟ п╡ п╥п╫п╟я┤п╣п╫п╦п╣ application/octet-stream (я█я┌п╬ п╠п╟п╥п╬п╡я▀п╧ MIME-я┌п╦п©, п╬п╠п╬п╥п╫п╟я┤п╟я▌я┴п╦п╧ б╚п╫п╟п╠п╬я─ п╠п╟п╧я┌п╬п╡б╩). п п╬п╫п╣я┤п╫п╬, п╣я│п╩п╦ Subversion я┐пЁп╟п╢п╟п╣я┌ я┌п╦п© я└п╟п╧п╩п╟ п╫п╣п©я─п╟п╡п╦п╩я▄п╫п╬, п╦п╩п╦ п╣я│п╩п╦ п╡я▀ п©п╬п╤п╣п╩п╟п╣я┌п╣ п©я─п╦я│п╡п╬п╦я┌я▄ я│п╡п╬п╧я│я┌п╡я┐ svn:mime-type п╠п╬п╩п╣п╣ я┌п╬я┤п╫п╬п╣ п╥п╫п╟я┤п╣п╫п╦п╣ Б─■ п╫п╟п©я─п╦п╪п╣я─, image/png п╦п╩п╦ application/x-shockwave-flash Б─■ п╡я▀ п╡я│п╣пЁп╢п╟ п╪п╬п╤п╣я┌п╣ я┐п╢п╟п╩п╦я┌я▄ п╦п╩п╦ п╬я┌я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟я┌я▄ я█я┌п╬ я│п╡п╬п╧я│я┌п╡п╬. (п≈п╟ п╢п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫п╬п╧ п╦п╫я└п╬я─п╪п╟я├п╦п╣п╧ п╬п╠ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦п╦ MIME-я┌п╦п©п╬п╡ п╡ Subversion п╬п╠я─п╟я┌п╦я┌п╣я│я▄ п╨ б╚п╒п╦п© я│п╬п╢п╣я─п╤п╦п╪п╬пЁп╬ я└п╟п╧п╩п╟б╩.)

п╖п╣я─п╣п╥ я│п╬п╠я│я┌п╡п╣п╫п╫я┐я▌ я│п╦я│я┌п╣п╪я┐ п╨п╬п╫я└п╦пЁя┐я─п╦я─п╬п╡п╟п╫п╦я▐ я│я─п╣п╢я▀ п╦я│п©п╬п╩п╫п╣п╫п╦я▐ (я│п╪. б╚п÷п╟я─п╟п╪п╣я┌я─я▀ п╡я─п╣п╪п╣п╫п╦ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐б╩) Subversion я┌п╟п╨п╤п╣ п©п╬п╢п╢п╣я─п╤п╦п╡п╟п╣я┌ п╠п╬п╩п╣п╣ пЁп╦п╠п╨я┐я▌ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п╟п╡я┌п╬п╪п╟я┌п╦я┤п╣я│п╨п╬п╧ я┐я│я┌п╟п╫п╬п╡п╨п╦ я│п╡п╬п╧я│я┌п╡, п╨п╬я┌п╬я─п╟я▐ п©п╬п╥п╡п╬п╩я▐п╣я┌ п╥п╟п╢п╟п╡п╟я┌я▄ я│п╬п╬я┌п╡п╣я┌я│я┌п╡п╦я▐ п╪п╣п╤п╢я┐ п╪п╟я│п╨п╟п╪п╦ п╦п╪п╣п╫ я└п╟п╧п╩п╬п╡ п╦ п╦п╪п╣п╫п╟п╪п╦ п╦ п╥п╫п╟я┤п╣п╫п╦я▐п╪п╦ я│п╡п╬п╧я│я┌п╡. п∙я┴п╣ я─п╟п╥: я█я┌п╦ я│п╬п╬я┌п╡п╣я┌я│я┌п╡п╦я▐ п╡п╬п╥п╢п╣п╧я│я┌п╡я┐я▌я┌ п╫п╟ п╢п╬п╠п╟п╡п╩п╣п╫п╦п╣ п╦ п╦п╪п©п╬я─я┌, п╦ п╪п╬пЁя┐я┌ п╫п╣ я┌п╬п╩я▄п╨п╬ п©п╣я─п╣п╬п©я─п╣п╢п╣п╩я▐я┌я▄ я─п╣я┬п╣п╫п╦п╣ п╬ MIME-я┌п╦п©п╣ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌, п©я─п╦п╫п╦п╪п╟п╣п╪п╬п╣ Subversion п╡ я┘п╬п╢п╣ я█я┌п╦я┘ п╬п©п╣я─п╟я├п╦п╧, п╫п╬ п╦ я┐я│я┌п╟п╫п╟п╡п╩п╦п╡п╟я┌я▄ п╢я─я┐пЁп╦п╣ я│я┌п╟п╫п╢п╟я─я┌п╫я▀п╣ п╦п╩п╦ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄я│п╨п╦п╣ я│п╡п╬п╧я│я┌п╡п╟. п²п╟п©я─п╦п╪п╣я─, п╡я▀ п╪п╬пЁп╩п╦ п╠я▀ п╥п╟п╢п╟я┌я▄ я│п╬п╬я┌п╡п╣я┌я│я┌п╡п╦п╣, я┤я┌п╬п╠я▀ п©я─п╦ п╨п╟п╤п╢п╬п╪ п╢п╬п╠п╟п╡п╩п╣п╫п╦п╦ JPEG-я└п╟п╧п╩п╟ Б─■ я┌п╬ п╣я│я┌я▄ я█п╩п╣п╪п╣п╫я┌п╟, я│п╬п╬я┌п╡п╣я┌я│я┌п╡я┐я▌я┴п╣пЁп╬ п╪п╟я│п╨п╣ *.jpg Б─■ Subversion п╟п╡я┌п╬п╪п╟я┌п╦я┤п╣я│п╨п╦ п©я─п╦я│п╡п╟п╦п╡п╟п╩ п╠я▀ я│п╡п╬п╧я│я┌п╡я┐ svn:mime-type п╥п╫п╟я┤п╣п╫п╦п╣ image/jpeg. п≤п╩п╦, п╨ п©я─п╦п╪п╣я─я┐, п╢п╩я▐ п╡я│п╣я┘ я└п╟п╧п╩п╬п╡, я│п╬п╬я┌п╡п╣я┌я│я┌п╡я┐я▌я┴п╦я┘ п╪п╟я│п╨п╣ *.cpp, я│п╡п╬п╧я│я┌п╡п╬ svn:eol-style я┐я│я┌п╟п╫п╟п╡п╩п╦п╡п╟п╩п╬я│я▄ п╠я▀ п╡ native, п╟ svn:keywords Б─■ п╡ Id. п÷п╬п╢п╢п╣я─п╤п╨п╟ п╟п╡я┌п╬п╪п╟я┌п╦я┤п╣я│п╨п╦я┘ я│п╡п╬п╧я│я┌п╡ Б─■ я█я┌п╬, п©п╬п╤п╟п╩я┐п╧, п╫п╟п╦п╠п╬п╩п╣п╣ я┐п╢п╬п╠п╫я▀п╧ п╦п╫я│я┌я─я┐п╪п╣п╫я┌ Subversion п╡ я┤п╟я│я┌п╦ я─п╟п╠п╬я┌я▀ я│п╬ я│п╡п╬п╧я│я┌п╡п╟п╪п╦ я│я─п╣п╢п╦ п╡я│п╣пЁп╬ п╫п╟п╠п╬я─п╟ п╢п╬я│я┌я┐п©п╫я▀я┘ я│я─п╣п╢я│я┌п╡. п║п╪. б╚Configб╩ п╢п╩я▐ п╢п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫п╬п╧ п╦п╫я└п╬я─п╪п╟я├п╦п╦ п╬ п╫п╟я│я┌я─п╬п╧п╨п╣ я┌п╟п╨п╬п╧ п©п╬п╢п╢п╣я─п╤п╨п╦.

Subversion п©я─п╦п╫п╟п╢п╩п╣п╤п╦я┌ п╨ п╪п╫п╬пЁп╬я┤п╦я│п╩п╣п╫п╫п╬п╪я┐ я│п╣п╪п╣п╧я│я┌п╡я┐ п©я─п╦п╩п╬п╤п╣п╫п╦п╧, я─п╟я│п©п╬п╥п╫п╟я▌я┴п╦я┘ п╦ п╦я│п©п╬п╩я▄п╥я┐я▌я┴п╦я┘ п╢п╩я▐ я┌п╦п©п╦п╥п╟я├п╦п╦ я│п╬п╢п╣я─п╤п╦п╪п╬пЁп╬ п╪п╫п╬пЁп╬я├п╣п╩п╣п╡я▀п╣ я─п╟я│я┬п╦я─п╣п╫п╦я▐ п╦п╫я┌п╣я─п╫п╣я┌-п©п╬я┤я┌я▀ (Multipurpose Internet Mail Extensions Б─■ MIME). п║п╡п╬п╧я│я┌п╡п╬ svn:mime-type п╫п╣ я┌п╬п╩я▄п╨п╬ я▐п╡п╩я▐п╣я┌я│я▐ я┐п╫п╦п╡п╣я─я│п╟п╩я▄п╫я▀п╪ п╪п╣я│я┌п╬п╪ я┘я─п╟п╫п╣п╫п╦я▐ п╦п╫я└п╬я─п╪п╟я├п╦п╦ п╬ я┌п╦п©п╣ я│п╬п╢п╣я─п╤п╦п╪п╬пЁп╬ я└п╟п╧п╩п╟, п╫п╬ п╦ п╬п©я─п╣п╢п╣п╩я▐п╣я┌ п╫п╣п╨п╬я┌п╬я─я▀п╣ п╬я│п╬п╠п╣п╫п╫п╬я│я┌п╦ п©п╬п╡п╣п╢п╣п╫п╦я▐ Subversion.

п²п╟п©я─п╦п╪п╣я─, п╬п╢п╫п╬п╧ п╦п╥ п©п╬п╩п╣п╥п╫я▀я┘ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌п╣п╧ Subversion я▐п╡п╩я▐п╣я┌я│я▐ п╨п╬п╫я┌п╣п╨я│я┌п╫п╬п╣, п©п╬я│я┌я─п╬я┤п╫п╬п╣ я│п╩п╦я▐п╫п╦п╣ п╦п╥п╪п╣п╫п╣п╫п╦п╧, п©п╬п╩я┐я┤п╣п╫п╫я▀я┘ п╬я┌ я│п╣я─п╡п╣я─п╟ п╡п╬ п╡я─п╣п╪я▐ п╬п╠п╫п╬п╡п╩п╣п╫п╦я▐, я│ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╣п╧. п·п╢п╫п╟п╨п╬, п╢п╩я▐ я└п╟п╧п╩п╬п╡, п╫п╣ я│п╬п╢п╣я─п╤п╟я┴п╦я┘ я┌п╣п╨я│я┌п╬п╡я▀я┘ п╢п╟п╫п╫я▀я┘, п╨п╟п╨ п©я─п╟п╡п╦п╩п╬, п╫п╣ я│я┐я┴п╣я│я┌п╡я┐п╣я┌ п©п╬п╫я▐я┌п╦я▐ б╚я│я┌я─п╬п╨п╦б╩. п÷п╬я█я┌п╬п╪я┐ п╢п╩я▐ п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫я▀я┘ я└п╟п╧п╩п╬п╡, я┤я▄п╣ я│п╡п╬п╧я│я┌п╡п╬ svn:mime-type я┐п╨п╟п╥я▀п╡п╟п╣я┌ п╫п╟ п╫п╣я┌п╣п╨я│я┌п╬п╡я▀п╧ MIME-я┌п╦п© (п╨п╟п╨ п©я─п╟п╡п╦п╩п╬, я█я┌п╬ п╡я│п╣, я┤я┌п╬ п╫п╣ п╫п╟я┤п╦п╫п╟п╣я┌я│я▐ я│ text/, я┘п╬я┌я▐ п╣я│я┌я▄ п╫п╣я│п╨п╬п╩я▄п╨п╬ п╦я│п╨п╩я▌я┤п╣п╫п╦п╧), Subversion п╫п╣ п╠я┐п╢п╣я┌ п©я▀я┌п╟я┌я▄я│я▐ п©я─п╬п╡п╣я│я┌п╦ п╨п╬п╫я┌п╣п╨я│я┌п╫п╬п╣ я│п╩п╦я▐п╫п╦п╣ п╡п╬ п╡я─п╣п╪я▐ п╬п╠п╫п╬п╡п╩п╣п╫п╦я▐. п▓п╪п╣я│я┌п╬ я█я┌п╬пЁп╬, п╨п╟п╤п╢я▀п╧ я─п╟п╥ п╨п╬пЁп╢п╟ п╡я▀ п╩п╬п╨п╟п╩я▄п╫п╬ п╪п╬п╢п╦я└п╦я├п╦я─я┐п╣я┌п╣ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ п╠п╦п╫п╟я─п╫п╬пЁп╬ я└п╟п╧п╩п╟, п╦ п╡я▀п©п╬п╩п╫я▐п╣я┌п╣ п©п╬я│п╩п╣ я█я┌п╬пЁп╬ п╬п╠п╫п╬п╡п╩п╣п╫п╦п╣, я└п╟п╧п╩ п╠я┐п╢п╣я┌ п©п╣я─п╣п╦п╪п╣п╫п╬п╡п╟п╫ я│ п╢п╬п╠п╟п╡п╩п╣п╫п╦п╣п╪ я─п╟я│я┬п╦я─п╣п╫п╦я▐ .orig, п©п╬я│п╩п╣ я┤п╣пЁп╬ Subversion п╥п╟п©п╦я┬п╣я┌ п©п╬п╢ п╬я─п╦пЁп╦п╫п╟п╩я▄п╫я▀п╪ п╦п╪п╣п╫п╣п╪ п╫п╬п╡я▀п╧ я└п╟п╧п╩ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, c п╦п╥п╪п╣п╫п╣п╫п╦я▐п╪п╦, п©п╬п╩я┐я┤п╣п╫п╫я▀п╪п╦ п╡ п©я─п╬я├п╣я│я│п╣ п╬п╠п╫п╬п╡п╩п╣п╫п╦я▐, п╫п╬ п╠п╣п╥ п╡п╟я┬п╦я┘ п╩п╬п╨п╟п╩я▄п╫я▀я┘ п╦я│п©я─п╟п╡п╩п╣п╫п╦п╧. п╒п╟п╨п╬п╣ п©п╬п╡п╣п╢п╣п╫п╦п╣ п©я─п╦п╥п╡п╟п╫п╬ п╥п╟я┴п╦я┌п╦я┌я▄ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐ п╬я┌ п╫п╣я┐п╢п╟я┤п╫я▀я┘ п©п╬п©я▀я┌п╬п╨ п╡я▀п©п╬п╩п╫п╦я┌я▄ п╨п╬п╫я┌п╣п╨я│я┌п╫п╬п╣ я│п╩п╦я▐п╫п╦п╣ п╢п╩я▐ я└п╟п╧п╩п╬п╡, п╨ п╨п╬я┌п╬я─я▀п╪ п╣пЁп╬ п╫п╣п╩я▄п╥я▐ п©я─п╦п╪п╣п╫п╦я┌я▄.

п я─п╬п╪п╣ я┌п╬пЁп╬, п╣я│п╩п╦ п╢п╩я▐ я└п╟п╧п╩п╟ п╬п©я─п╣п╢п╣п╩п╣п╫п╬ я│п╡п╬п╧я│я┌п╡п╬ svn:mime-type, Apache-п╪п╬п╢я┐п╩я▄ Subversion п╠я┐п╢п╣я┌ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╣пЁп╬ п╥п╫п╟я┤п╣п╫п╦п╣ п©я─п╦ я└п╬я─п╪п╦я─п╬п╡п╟п╫п╦п╦ HTTP-п╥п╟пЁп╬п╩п╬п╡п╨п╟ Content-type: п╡ п╬я┌п╡п╣я┌ п╫п╟ GET-п╥п╟п©я─п╬я│я▀. п▒п╩п╟пЁп╬п╢п╟я─я▐ я█я┌п╬п╪я┐ п╡п╟я┬ п╠я─п╟я┐п╥п╣я─ (п╡ я┌п╬п╪ я│п╩я┐я┤п╟п╣, п╣я│п╩п╦ п╬п╫ п╠я┐п╢п╣я┌ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ п╢п╩я▐ п©я─п╬я│п╪п╬я┌я─п╟ я│п╬п╢п╣я─п╤п╦п╪п╬пЁп╬ Subversion-я┘я─п╟п╫п╦п╩п╦я┴п╟) п╠я┐п╢п╣я┌ п╥п╫п╟я┌я▄, п╨п╟п╨ п©я─п╟п╡п╦п╩я▄п╫п╬ п╬я┌п╬п╠я─п╟п╥п╦я┌я▄ я█я┌п╬я┌ я└п╟п╧п╩.

п²п╟ п╪п╫п╬пЁп╦я┘ п╬п©п╣я─п╟я├п╦п╬п╫п╫я▀я┘ я│п╦я│я┌п╣п╪п╟я┘ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐ я└п╟п╧п╩п╟ п╨п╟п╨ п╨п╬п╪п╟п╫п╢я▀ п╬п©я─п╣п╢п╣п╩я▐п╣я┌я│я▐ п╠п╦я┌п╬п╪ я─п╟п╥я─п╣я┬п╣п╫п╦я▐ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐. п·п╠я▀я┤п╫п╬ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌ я█я┌п╬я┌ п╠п╦я┌ п╫п╣ п╥п╟п╢п╟п╫; п╬п╫ п╢п╬п╩п╤п╣п╫ п╠я▀я┌я▄ я▐п╡п╫п╬ я┐я│я┌п╟п╫п╬п╡п╩п╣п╫ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╣п╪ п╢п╩я▐ я┌п╣я┘ я└п╟п╧п╩п╬п╡, п╨п╬я┌п╬я─я▀п╪ я█я┌п╬ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬. п·п╢п╫п╟п╨п╬, п╠я▀п╩п╬ п╠я▀ я│п╩п╦я┬п╨п╬п╪ я│п╩п╬п╤п╫я▀п╪ п╥п╟п©п╬п╪п╦п╫п╟я┌я▄, п╨п╟п╨п╦п╣ п╦п╪п╣п╫п╫п╬ я└п╟п╧п╩я▀ п╡ я┌п╬п╩я▄п╨п╬ я┤я┌п╬ я│п╬п╥п╢п╟п╫п╫п╬п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╢п╬п╩п╤п╫я▀ п╦п╪п╣я┌я▄ я┐я│я┌п╟п╫п╬п╡п╩п╣п╫п╫я▀п╧ п╠п╦я┌ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐, п╦ я┐я│я┌п╟п╫п╟п╡п╩п╦п╡п╟я┌я▄ я█я┌п╬я┌ п╠п╦я┌. п÷п╬я█я┌п╬п╪я┐ Subversion п©п╬п╢п╢п╣я─п╤п╦п╡п╟п╣я┌ я│п╡п╬п╧я│я┌п╡п╬ svn:executable, п©п╬п╥п╡п╬п╩я▐я▌я┴п╣п╣ я┐п╨п╟п╥п╟я┌я▄, п╢п╩я▐ п╨п╟п╨п╦я┘ я└п╟п╧п╩п╬п╡ п╢п╬п╩п╤п╣п╫ п╠я▀я┌я▄ я┐я│я┌п╟п╫п╬п╡п╩п╣п╫ п╠п╦я┌ п╦я│п©п╬п╩п╫п╣п╫п╦я▐. п÷я─п╦ я│п╬п╥п╢п╟п╫п╦п╦ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ Subversion я│п╟п╪п╬я│я┌п╬я▐я┌п╣п╩я▄п╫п╬ я┐я│я┌п╟п╫п╬п╡п╦я┌ я█я┌п╬я┌ п╠п╦я┌ п╢п╩я▐ я┌п╟п╨п╦я┘ я└п╟п╧п╩п╬п╡.

п╜я┌п╬ я│п╡п╬п╧я│я┌п╡п╬ п╫п╣ п╬п╨п╟п╥я▀п╡п╟п╣я┌ п╫п╦п╨п╟п╨п╬пЁп╬ я█я└я└п╣п╨я┌п╟ п╫п╟ я└п╟п╧п╩п╬п╡я▀я┘ я│п╦я│я┌п╣п╪п╟я┘, п╫п╣ п╦я│п©п╬п╩я▄п╥я┐я▌я┴п╦я┘ п╠п╦я┌п╟ я─п╟п╥я─п╣я┬п╣п╫п╦я▐ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐, я┌п╟п╨п╦я┘ п╨п╟п╨ FAT32 п╦ NTFS. ^[16]. п я─п╬п╪п╣ я┌п╬пЁп╬, я┘п╬я┌я▐ п╥п╫п╟я┤п╣п╫п╦п╣ я█я┌п╬пЁп╬ я│п╡п╬п╧я│я┌п╡п╟ п╫п╣ п╥п╟п╢п╟п╫п╬, Subversion п©я─п╦п╫я┐п╢п╦я┌п╣п╩я▄п╫п╬ я┐я│я┌п╟п╫п╟п╡п╩п╦п╡п╟п╣я┌ п╣п╪я┐ п╥п╫п╟я┤п╣п╫п╦п╣ *. п²п╟п╨п╬п╫п╣я├, я█я┌п╬ я│п╡п╬п╧я│я┌п╡п╬ п╢п╣п╧я│я┌п╡п╦я┌п╣п╩я▄п╫п╬ я┌п╬п╩я▄п╨п╬ п╢п╩я▐ я└п╟п╧п╩п╬п╡, п╫п╬ п╫п╣ п╢п╩я▐ п╨п╟я┌п╟п╩п╬пЁп╬п╡.

Subversion я│я┤п╦я┌п╟п╣я┌, я┤я┌п╬ я└п╟п╧п╩ я│п╬п╢п╣я─п╤п╦я┌ я┤п╦я┌п╟п╣п╪я▀п╣ п╢п╟п╫п╫я▀п╣, п╣я│п╩п╦ п╫п╟ п╬п╠я─п╟я┌п╫п╬п╣ п╫п╣ я┐п╨п╟п╥я▀п╡п╟п╣я┌ п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫п╬п╣ я│п╡п╬п╧я│я┌п╡п╬ я└п╟п╧п╩п╟ svn:mime-type. п▓ п╬п╠я┴п╣п╪-я┌п╬, Subversion п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п╥п╫п╟я┌я▄ п╬п╠ я█я┌п╬п╪ я┌п╬п╩я▄п╨п╬ п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ п╬п©я─п╣п╢п╣п╩п╦я┌я▄ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п©п╬я│я┌я─п╬п╣п╫п╦я▐ п╨п╬п╫я┌п╣п╨я│я┌п╫п╬пЁп╬ п╬я┌я┤п╣я┌п╟ п╬ я─п╟п╥п╩п╦я┤п╦я▐я┘. п▓ п©я─п╬я┌п╦п╡п╫п╬п╪ я│п╩я┐я┤п╟п╣ Subversion п╠я┐п╢п╣я┌ п╡п╬я│п©я─п╦п╫п╦п╪п╟я┌я▄ я└п╟п╧п╩ п╩п╦я┬я▄ п╨п╟п╨ п╫п╟п╠п╬я─ п╠п╟п╧я┌п╬п╡.

п║п╨п╟п╥п╟п╫п╫п╬п╣ п╬п╥п╫п╟я┤п╟п╣я┌, я┤я┌п╬ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌ Subversion п╫п╣ я┐п╢п╣п╩я▐п╣я┌ п╫п╦п╨п╟п╨п╬пЁп╬ п╡п╫п╦п╪п╟п╫п╦я▐ п╦я│п©п╬п╩я▄п╥я┐п╣п╪п╬п╧ п╡ я└п╟п╧п╩п╟я┘ я─п╟п╥п╫п╬п╡п╦п╢п╫п╬я│я┌п╦ п╪п╟я─п╨п╣я─п╟ п╨п╬п╫я├п╟ я│я┌я─п╬п╨п╦ (EOL). п  я│п╬п╤п╟п╩п╣п╫п╦я▌, я─п╟п╥п╩п╦я┤п╫я▀п╣ п╬п©п╣я─п╟я├п╦п╬п╫п╫я▀п╣ я│п╦я│я┌п╣п╪я▀ п╦я│п©п╬п╩я▄п╥я┐я▌я┌ я─п╟п╥п╩п╦я┤п╫я▀п╣ я│п╬пЁп╩п╟я┬п╣п╫п╦я▐ п╬ я┌п╬п╪, п╨п╟п╨п╟я▐ п©п╬я│п╩п╣п╢п╬п╡п╟я┌п╣п╩я▄п╫п╬я│я┌я▄ я│п╦п╪п╡п╬п╩п╬п╡ п╬п╥п╫п╟я┤п╟п╣я┌ п╨п╬п╫п╣я├ я┌п╣п╨я│я┌п╬п╡п╬п╧ я│я┌я─п╬п╨п╦ п╡ я└п╟п╧п╩п╣. п²п╟п©я─п╦п╪п╣я─, п©я─п╬пЁя─п╟п╪п╪я▀ п©п╬п╢ Windows п╬п╠я▀я┤п╫п╬ п╦я│п©п╬п╩я▄п╥я┐я▌я┌ п╡ п╨п╟я┤п╣я│я┌п╡п╣ п©я─п╦п╥п╫п╟п╨п╟ п╨п╬п╫я├п╟ я│я┌я─п╬п╨п╦ п©п╬я│п╩п╣п╢п╬п╡п╟я┌п╣п╩я▄п╫п╬я│я┌я▄ п╦п╥ п╢п╡я┐я┘ я┐п©я─п╟п╡п╩я▐я▌я┴п╦я┘ я│п╦п╪п╡п╬п╩п╬п╡ ASCII Б─■ п╡п╬п╥п╡я─п╟я┌п╟ п╨п╟я─п╣я┌п╨п╦ (CR) п╦ п©п╣я─п╣п╡п╬п╢п╟ я│я┌я─п╬п╨п╦ (LF). п▓ я┌п╬ п╤п╣ п╡я─п╣п╪я▐ п©я─п╬пЁя─п╟п╪п╪я▀ п©п╬п╢ Unix п╢п╩я▐ п╬п╠п╬п╥п╫п╟я┤п╣п╫п╦я▐ п╨п╬п╫я├п╟ я│я┌я─п╬п╨п╦ п╦я│п©п╬п╩я▄п╥я┐я▌я┌ п╣п╢п╦п╫я│я┌п╡п╣п╫п╫я▀п╧ я│п╦п╪п╡п╬п╩ LF.

п■п╟п╩п╣п╨п╬ п╫п╣ п╡я│п╣ п©я─п╬пЁя─п╟п╪я▀ я│п©п╬я│п╬п╠п╫я▀ п©п╬п╫п╦п╪п╟я┌я▄ я└п╟п╧п╩я▀, п╡ п╨п╬я┌п╬я─я▀я┘ п©я─п╦п╥п╫п╟п╨ п╨п╬п╫я├п╟ я│я┌я─п╬п╨п╦ п╬я┌п╩п╦я┤п╟п╣я┌я│я▐ п©п╬ я└п╬я─п╪п╟я┌я┐ п╬я┌ п©я─п╦п╫я▐я┌п╬пЁп╬ я│я┌п╦п╩я▐ п╥п╟п╡п╣я─я┬п╣п╫п╦я▐ я│я┌я─п╬п╨ п╡ п╢п╟п╫п╫п╬п╧ п╬п©п╣я─п╟я├п╦п╬п╫п╫п╬п╧ я│п╦я│я┌п╣п╪п╣. п·п╠я▀я┤п╫я▀п╪ п╢п╣п╩п╬п╪ я▐п╡п╩я▐п╣я┌я│я▐ я│п╦я┌я┐п╟я├п╦я▐, п╨п╬пЁп╢п╟ п©я─п╬пЁя─п╟п╪п╪я▀ п©п╬п╢ Unix я─п╟я│я│п╪п╟я┌я─п╦п╡п╟я▌я┌ я│п╦п╪п╡п╬п╩ CR, п©я─п╦я│я┐я┌я│я┌п╡я┐я▌я┴п╦п╧ п╡ я└п╟п╧п╩п╟я┘ Windows, п╨п╟п╨ п╬п╠я▀я┤п╫я▀п╧ я│п╦п╪п╡п╬п╩ (я┤п╟я│я┌п╬ п©я─п╣п╢я│я┌п╟п╡п╩я▐я▐ п╣пЁп╬ п╨п╟п╨ ^M), п╦п╩п╦ п╨п╬пЁп╢п╟ п©я─п╬пЁя─п╟п╪п╪я▀ п©п╬п╢ Windows я│п╩п╣п©п╩я▐я▌я┌ п╡я│п╣ я│я┌я─п╬п╨п╦ я└п╟п╧п╩п╟ Unix п╡ п╬п╢п╫я┐ пЁп╦пЁп╟п╫я┌я│п╨я┐я▌ я│я┌я─п╬п╨я┐, п©п╬я│п╨п╬п╩я▄п╨я┐ п╡ п╫п╣п╪ п╬я┌я│я┐я┌я│я┌п╡я┐я▌я┌ п╨п╬п╪п╠п╦п╫п╟я├п╦п╦ я│п╦п╪п╡п╬п╩п╬п╡ п╡п╬п╥п╡я─п╟я┌п╟ п╨п╟я─п╣я┌п╨п╦ п╦ п©п╣я─п╣п╡п╬п╢п╟ я│я┌я─п╬п╨п╦ (п╦п╩п╦ CRLF), п╬п╠п╬п╥п╫п╟я┤п╟я▌я┴п╦п╣ п╨п╬п╫я├я▀ я│я┌я─п╬п╨.

п╒п╟п╨п╟я▐ я┤я┐п╡я│я┌п╡п╦я┌п╣п╩я▄п╫п╬я│я┌я▄ п╨ я┤я┐п╤п╣я─п╬п╢п╫я▀п╪ EOL-п╪п╟я─п╨п╣я─п╟п╪ п╪п╬п╤п╣я┌ я│я┌п╟я┌я▄ я│п╣я─я▄п╣п╥п╫п╬п╧ п©я─п╬п╠п╩п╣п╪п╬п╧ п╢п╩я▐ п╩я▌п╢п╣п╧, я│п╬п╡п╪п╣я│я┌п╫п╬ п╦я│п©п╬п╩я▄п╥я┐я▌я┴п╦я┘ п╬п╢п╫п╦ п╦ я┌п╣ п╤п╣ я└п╟п╧п╩я▀ п╡ я─п╟п╥п╩п╦я┤п╫я▀я┘ п╬п©п╣я─п╟я├п╦п╬п╫п╫я▀я┘ я│п╦я│я┌п╣п╪п╟я┘. п▓п╬п╥я▄п╪п╣п╪ п╢п╩я▐ п©я─п╦п╪п╣я─п╟ я└п╟п╧п╩ я│ п╦я│я┘п╬п╢п╫я▀п╪ п╨п╬п╢п╬п╪ п©я─п╬пЁя─п╟п╪п╪я▀ п╦ я─п╟п╥я─п╟п╠п╬я┌я┤п╦п╨п╬п╡, я─п╣п╢п╟п╨я┌п╦я─я┐я▌я┴п╦я┘ я█я┌п╬я┌ я└п╟п╧п╩ п╨п╟п╨ п©п╬п╢ Windows, я┌п╟п╨ п╦ п©п╬п╢ Unix. п∙я│п╩п╦ п╡я│п╣ я─п╟п╥я─п╟п╠п╬я┌я┤п╦п╨п╦ п╠я┐п╢я┐я┌ п╡я│п╣пЁп╢п╟ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п╦п╫я│я┌я─я┐п╪п╣п╫я┌я▀, я│п╬я┘я─п╟п╫я▐я▌я┴п╦п╣ п╡ я└п╟п╧п╩п╣ п©я─п╣п╤п╫п╦п╧ я│я┌п╦п╩я▄ п╥п╟п╡п╣я─я┬п╣п╫п╦я▐ я│я┌я─п╬п╨, п©я─п╬п╠п╩п╣п╪ п╫п╣ п╡п╬п╥п╫п╦п╨п╫п╣я┌.

п²п╬ п╫п╟ п©я─п╟п╨я┌п╦п╨п╣ п╪п╫п╬пЁп╦п╣ я─п╟я│п©я─п╬я│я┌я─п╟п╫п╣п╫п╫я▀п╣ я┐я┌п╦п╩п╦я┌я▀ п╩п╦п╠п╬ п╫п╣ я┐п╪п╣я▌я┌ п©я─п╟п╡п╦п╩я▄п╫п╬ я│я┤п╦я┌я▀п╡п╟я┌я▄ я└п╟п╧п╩я▀ я│ я┤я┐п╤п╣я─п╬п╢п╫я▀п╪п╦ EOL-п╪п╟я─п╨п╣я─п╟п╪п╦, п╩п╦п╠п╬ п╨п╬п╫п╡п╣я─я┌п╦я─я┐я▌я┌ п╨п╬п╫я├я▀ я│я┌я─п╬п╨ п╡ я└п╟п╧п╩п╣ п╨ я─п╬п╢п╫п╬п╪я┐ я│я┌п╦п╩я▌ п©я─п╦ я│п╬я┘я─п╟п╫п╣п╫п╦п╦ я└п╟п╧п╩п╟. п∙я│п╩п╦ я─п╟п╥я─п╟п╠п╬я┌я┤п╦п╨ я│я┌п╟п╩п╨п╦п╡п╟п╣я┌я│я▐ я│ п©п╣я─п╡я▀п╪ я│п╩я┐я┤п╟п╣п╪, п╬п╫ п╬п╨п╟п╥я▀п╡п╟п╣я┌я│я▐ п╡я▀п╫я┐п╤п╢п╣п╫п╫я▀п╪ п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ п╡п╫п╣я┬п╫п╦п╪п╦ я┐я┌п╦п╩п╦я┌п╟п╪п╦ п╨п╬п╫п╡п╣я─я┌п╟я├п╦п╦ (я┌п╟п╨п╦п╪п╦ п╨п╟п╨ dos2unix п╦п╩п╦ п╣п╣ п╟п╫п╟п╩п╬пЁп╦, unix2dos), я┤я┌п╬п╠я▀ п©п╬п╢пЁп╬я┌п╬п╡п╦я┌я▄ я└п╟п╧п╩ п╨ я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟п╫п╦я▌. п▓п╬ п╡я┌п╬я─п╬п╪ я│п╩я┐я┤п╟п╣ п╢п╬п©п╬п╩п╫п╦я┌п╣п╩я▄п╫п╟я▐ п©п╬п╢пЁп╬я┌п╬п╡п╨п╟ я└п╟п╧п╩п╬п╡ п╫п╣ я┌я─п╣п╠я┐п╣я┌я│я▐. п·п╢п╫п╟п╨п╬, п╡ п╬п╠п╬п╦я┘ я│п╩я┐я┤п╟я▐я┘ п©п╬п╩я┐я┤п╟п╣я┌я│я▐ я└п╟п╧п╩, п╨п╟п╤п╢п╟я▐ я│я┌я─п╬п╨п╟ п╡ п╨п╬я┌п╬я─п╬п╪ п╬я┌п╩п╦я┤п╟п╣я┌я│я▐ п╬я┌ п╦я│я┘п╬п╢п╫п╬п╧! п÷я─п╣п╤п╢п╣ я┤п╣п╪ я└п╦п╨я│п╦я─п╬п╡п╟я┌я▄ я│п╡п╬п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄ п╪п╬п╤п╣я┌ я│п╢п╣п╩п╟я┌я▄ п╬п╢п╫п╬ п╦п╥ п╢п╡я┐я┘. п·п╫ п╪п╬п╤п╣я┌ п╩п╦п╠п╬ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ я┐я┌п╦п╩п╦я┌я┐ п╨п╬п╫п╡п╣я─я┌п╟я├п╦п╦, я┤я┌п╬п╠я▀ п╡п╬я│я│я┌п╟п╫п╬п╡п╦я┌я▄ п╡ п╪п╬п╢п╦я└п╦я├п╦я─п╬п╡п╟п╫п╫п╬п╪ я└п╟п╧п╩п╣ п©я─п╣п╤п╫п╦п╧ я│я┌п╦п╩я▄ п╥п╟п╡п╣я─я┬п╣п╫п╦я▐ я│я┌я─п╬п╨; п╩п╦п╠п╬ п©я─п╬я│я┌п╬ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟я┌я▄ я└п╟п╧п╩ я│ п╫п╬п╡я▀п╪п╦ EOL-п╪п╟я─п╨п╣я─п╟п╪п╦.

п═п╣п╥я┐п╩я▄я┌п╟я┌п╬п╪ я┌п╟п╨п╬пЁп╬ я│я├п╣п╫п╟я─п╦я▐ я│я┌п╟п╫я┐я┌ п╫п╟п©я─п╟я│п╫п╟я▐ я┌я─п╟я┌п╟ п╡я─п╣п╪п╣п╫п╦ п╦ п╫п╣п╤п╣п╩п╟я┌п╣п╩я▄п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я└п╦п╨я│п╦я─я┐п╣п╪я▀я┘ я└п╟п╧п╩п╟я┘. п²п╟п©я─п╟я│п╫п╟я▐ я┌я─п╟я┌п╟ п╡я─п╣п╪п╣п╫п╦ я│п╟п╪п╟ п©п╬ я│п╣п╠п╣ п╬п╠я┘п╬п╢п╦я┌я│я▐ п╢п╬п╡п╬п╩я▄п╫п╬ п╢п╬я─п╬пЁп╬. п░ п╨п╬пЁп╢п╟ я└п╦п╨я│п╟я├п╦я▐ п╡п╫п╬я│п╦я┌ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ п╨п╟п╤п╢я┐я▌ я│я┌я─п╬п╨я┐ я└п╟п╧п╩п╟, я│я┌п╟п╫п╬п╡п╦я┌я│я▐ п╫п╣п╡п╬п╥п╪п╬п╤п╫я▀п╪ п╬п©я─п╣п╢п╣п╩п╦я┌я▄, п╨п╟п╨п╦п╣ я│я┌я─п╬п╨п╦ я└п╟п╧п╩п╟ п╢п╣п╧я│я┌п╡п╦я┌п╣п╩я▄п╫п╬ п╦п╥п╪п╣п╫п╦п╩п╦я│я▄ п©п╬ я│я┐я┴п╣я│я┌п╡я┐. п▒я▀п╩ п╩п╦ я┐я│я┌я─п╟п╫п╣п╫ я┌п╬я┌ я│п╟п╪я▀п╧ п╠п╟пЁ? п▓ п╨п╟п╨п╬п╧ я│я┌я─п╬п╨п╣ п╦п╪п╣п╩п╟я│я▄ я│п╦п╫я┌п╟п╨я│п╦я┤п╣я│п╨п╟я▐ п╬я┬п╦п╠п╨п╟?

п■п╟п╫п╫я┐я▌ п©я─п╬п╠п╩п╣п╪я┐ я─п╣я┬п╟п╣я┌ я│п╡п╬п╧я│я┌п╡п╬ svn:eol-style. п п╬пЁп╢п╟ я█я┌п╬п╪я┐ я│п╡п╬п╧я│я┌п╡я┐ п╥п╟п╢п╟п╫п╬ п╬п╢п╫п╬ п╦п╥ п╢п╬п©я┐я│я┌п╦п╪я▀я┘ п╥п╫п╟я┤п╣п╫п╦п╧, Subversion п╦я│п©п╬п╩я▄п╥я┐п╣я┌ п╣пЁп╬ п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ п╬п©я─п╣п╢п╣п╩п╦я┌я▄ п╡п╟я─п╦п╟п╫я┌ я│п©п╣я├п╦п╟п╩я▄п╫п╬п╧ п╬п╠я─п╟п╠п╬я┌п╨п╦ я└п╟п╧п╩п╟, п©я─п╬п╦п╥п╡п╬п╢п╦п╪п╬п╧ п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ я│я┌п╦п╩я▄ п╥п╟п╡п╣я─я┬п╣п╫п╦я▐ я│я┌я─п╬п╨п╦ п╫п╣ п╦п╥п╪п╣п╫я▐п╩я│я▐ я┌я┐п╢п╟-я│я▌п╢п╟ п©я─п╦ п╨п╟п╤п╢п╬п╧ я└п╦п╨я│п╟я├п╦п╦, п╡я▀п©п╬п╩п╫я▐п╣п╪п╬п╧ п╦п╥ п╢я─я┐пЁп╬п╧ п╬п©п╣я─п╟я├п╦п╬п╫п╫п╬п╧ я│п╦я│я┌п╣п╪я▀. п■п╬п©я┐я│я┌п╦п╪я▀ я│п╩п╣п╢я┐я▌я┴п╦п╣ п╥п╫п╟я┤п╣п╫п╦я▐:

In the Subversion repository, a lock is a piece of metadata which grants exclusive access to one user to change a file. This user is said to be the lock owner. Each lock also has a unique identifier, typically a long string of characters, known as the lock token. The repository manages locks, ultimately handling their creation, enforcement, and removal. If any commit transaction attempts to modify or delete a locked file (or delete one of the parent directories of the file), the repository will demand two pieces of informationБ─■that the client performing the commit be authenticated as the lock owner, and that the lock token has been provided as part of the commit process as a sort of proof that client knows which lock it is using.

To demonstrate lock creation, let's refer back to our example of multiple graphic designers working with on the same binary image files. Harry has decided to change a JPEG image. To prevent other people from committing changes to the file while he is modifying it (as well as alerting them that he is about to change it), he locks the file in the repository using the svn lock command.

$ svn lock banana.jpg --message "Editing file for tomorrow's release."
'banana.jpg' locked by user 'harry'.
$

There are a number of new things demonstrated in the previous example. First, notice that Harry passed the --message option to svn lock. Similar to svn commit, the svn lock command can take comments (either via --message (-m) or --file (-F)) to describe the reason for locking the file. Unlike svn commit, however, svn lock will not demand a message by launching your preferred text editor. Lock comments are optional, but still recommended to aid communication.

Secondly, the lock attempt succeeded. This means that the file wasn't already locked, and that Harry had the latest version of the file. If Harry's working copy of the file had been out-of-date, the repository would have rejected the request, forcing Harry to svn update and reattempt the locking command. The locking command would also have failed if the file already been locked by someone else.

As you can see, the svn lock command prints confirmation of the successful lock. At this point, the fact that the file is locked becomes apparent in the output of the svn status and svn info reporting subcommands.

$ svn status
     K banana.jpg

$ svn info banana.jpg
Path: banana.jpg
Name: banana.jpg
URL: http://svn.example.com/repos/project/banana.jpg
Repository UUID: edb2f264-5ef2-0310-a47a-87b0ce17a8ec
Revision: 2198
Node Kind: file
Schedule: normal
Last Changed Author: frank
Last Changed Rev: 1950
Last Changed Date: 2006-03-15 12:43:04 -0600 (Wed, 15 Mar 2006)
Text Last Updated: 2006-06-08 19:23:07 -0500 (Thu, 08 Jun 2006)
Properties Last Updated: 2006-06-08 19:23:07 -0500 (Thu, 08 Jun 2006)
Checksum: 3b110d3b10638f5d1f4fe0f436a5a2a5
Lock Token: opaquelocktoken:0c0f600b-88f9-0310-9e48-355b44d4a58e
Lock Owner: harry
Lock Created: 2006-06-14 17:20:31 -0500 (Wed, 14 Jun 2006)
Lock Comment (1 line):
Editing file for tomorrow's release.

$

That the svn info command, which does not contact the repository when run against working copy paths, can display the lock token reveals an important fact about lock tokensБ─■that they are cached in the working copy. The presence of the lock token is critical. It gives the working copy authorization to make use of the lock later on. Also, the svn status command shows a K next to the file (short for locKed), indicating that the lock token is present.

Now that Harry has locked banana.jpg, Sally is unable to change or delete that file:

$ svn delete banana.jpg
D         banana.jpg
$ svn commit -m "Delete useless file."
Deleting       banana.jpg
svn: Commit failed (details follow):
svn: DELETE of
'/repos/project/!svn/wrk/64bad3a9-96f9-0310-818a-df4224ddc35d/banana.jpg':
423 Locked (http://svn.example.com)
$

But Harry, after touching up the banana's shade of yellow, is able to commit his changes to the file. That's because he authenticates as the lock owner, and also because his working copy holds the correct lock token:

$ svn status
M    K banana.jpg
$ svn commit -m "Make banana more yellow"
Sending        banana.jpg
Transmitting file data .
Committed revision 2201.
$ svn status
$

Notice that after the commit is finished, svn status shows that the lock token is no longer present in working copy. This is the standard behavior of svn commitБ─■it searches the working copy (or list of targets, if you provide such a list) for local modifications, and sends all the lock tokens it encounters during this walk to the server as part of the commit transaction. After the commit completes successfully, all of the repository locks that were mentioned are releasedБ─■even on files that weren't committed. This is meant to discourage users from being sloppy about locking, or from holding locks for too long. If Harry haphazardly locks thirty files in a directory named images because he's unsure of which files he needs to change, yet only only changes four of those file, when he runs svn commit images, the process will still release all thirty locks.

This behavior of automatically releasing locks can be overridden with the --no-unlock option to svn commit. This is best used for those times when you want to commit changes, but still plan to make more changes and thus need to retain existing locks. You can also make this your default behavior by setting the no-unlock runtime configuration option (see б╚п÷п╟я─п╟п╪п╣я┌я─я▀ п╡я─п╣п╪п╣п╫п╦ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐б╩).

Of course, locking a file doesn't oblige one to commit a change to it. The lock can be released at any time with a simple svn unlock command:

$ svn unlock banana.c
'banana.c' unlocked.

When a commit fails due to someone else's locks, it's fairly easy to learn about them. The easiest of these is svn status --show-updates:

$ svn status --show-updates
M              23   bar.c
M    O         32   raisin.jpg
       *       72   foo.h
Status against revision:     105
$

In this example, Sally can see not only that her copy of foo.h is out-of-date, but that one of the two modified files she plans to commit is locked in the repository. The O symbol stands for б╚Otherб╩, meaning that a lock exists on the file, and was created by somebody else. If she were to attempt a commit, the lock on raisin.jpg would prevent it. Sally is left wondering who made the lock, when, and why. Once again, svn info has the answers:

$ svn info http://svn.example.com/repos/project/raisin.jpg
Path: raisin.jpg
Name: raisin.jpg
URL: http://svn.example.com/repos/project/raisin.jpg
Repository UUID: edb2f264-5ef2-0310-a47a-87b0ce17a8ec
Revision: 105
Node Kind: file
Last Changed Author: sally
Last Changed Rev: 32
Last Changed Date: 2006-01-25 12:43:04 -0600 (Sun, 25 Jan 2006)
Lock Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b
Lock Owner: harry
Lock Created: 2006-02-16 13:29:18 -0500 (Thu, 16 Feb 2006)
Lock Comment (1 line):
Need to make a quick tweak to this image.
$

Just as svn info can be used to examine objects in the working copy, it can also be used to examine objects in the repository. If the main argument to svn info is a working copy path, then all of the working copy's cached information is displayed; any mention of a lock means that the working copy is holding a lock token (if a file is locked by another user or in another working copy, svn info on a working copy path will show no lock information at all). If the main argument to svn info is a URL, then the information reflects the latest version of an object in the repository, and any mention of a lock describes the current lock on the object.

So in this particular example, Sally can see that Harry locked the file on February 16th to б╚make a quick tweakб╩. It being June, she suspects that he probably forgot all about the lock. She might phone Harry to complain and ask him to release the lock. If he's unavailable, she might try to forcibly break the lock herself or ask an administrator to do so.

A repository lock isn't sacredБ─■in Subversion's default configuration state, locks can be released not only by the person who created them, but by anyone at all. When somebody other than the original lock creator destroys a lock, we refer to this as breaking the lock.

From the administrator's chair, it's simple to break locks. The svnlook and svnadmin programs have the ability to display and remove locks directly from the repository. (For more information about these tools, see б╚An Administrator's Toolkitб╩.)

$ svnadmin lslocks /usr/local/svn/repos
Path: /project2/images/banana.jpg
UUID Token: opaquelocktoken:c32b4d88-e8fb-2310-abb3-153ff1236923
Owner: frank
Created: 2006-06-15 13:29:18 -0500 (Thu, 15 Jun 2006)
Expires:
Comment (1 line):
Still improving the yellow color.

Path: /project/raisin.jpg
UUID Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b
Owner: harry
Created: 2006-02-16 13:29:18 -0500 (Thu, 16 Feb 2006)
Expires:
Comment (1 line):
Need to make a quick tweak to this image.

$ svnadmin rmlocks /usr/local/svn/repos /project/raisin.jpg
Removed lock on '/project/raisin.jpg'.
$

The more interesting option is allowing users to break each other's locks over the network. To do this, Sally simply needs to pass the --force to the unlock command:

$ svn status --show-updates
M              23   bar.c
M    O         32   raisin.jpg
       *       72   foo.h
Status against revision:     105
$ svn unlock raisin.jpg
svn: 'raisin.jpg' is not locked in this working copy
$ svn info raisin.jpg | grep URL
URL: http://svn.example.com/repos/project/raisin.jpg
$ svn unlock http://svn.example.com/repos/project/raisin.jpg
svn: Unlock request failed: 403 Forbidden (http://svn.example.com)
$ svn unlock --force http://svn.example.com/repos/project/raisin.jpg
'raisin.jpg' unlocked.
$

Now, Sally's initial attempt to unlock failed because she ran svn unlock directly on her working copy of the file, and no lock token was present. To remove the lock directly from the repository, she needs to pass a URL to svn unlock. Her first attempt to unlock the URL fails, because she can't authenticate as the lock owner (nor does she have the lock token). But when she passes --force, the authentication and authorization requirements are ignored, and the remote lock is broken.

Of course, simply breaking a lock may not be enough. In the running example, Sally may not only want to break Harry's long-forgotten lock, but re-lock the file for her own use. She can accomplish this by running svn unlock --force and then svn lock back-to-back, but there's a small chance that somebody else might lock the file between the two commands. The simpler thing to is steal the lock, which involves breaking and re-locking the file all in one atomic step. To do this, Sally passes the --force option to svn lock:

$ svn lock raisin.jpg
svn: Lock request failed: 423 Locked (http://svn.example.com)
$ svn lock --force raisin.jpg
'raisin.jpg' locked by user 'sally'.
$

In any case, whether the lock is broken or stolen, Harry may be in for a surprise. Harry's working copy still contains the original lock token, but that lock no longer exists. The lock token is said to be defunct. The lock represented by the lock-token has either been broken (no longer in the repository), or stolen (replaced with a different lock). Either way, Harry can see this by asking svn status to contact the repository:

$ svn status
     K raisin.jpg
$ svn status --show-updates
     B         32   raisin.jpg
$ svn update
  B  raisin.jpg
$ svn status
$

If the repository lock was broken, then svn status --show-updates displays a B (Broken) symbol next to the file. If a new lock exists in place of the old one, then a T (sTolen) symbol is shown. Finally, svn update notices any defunct lock tokens and removes them from the working copy.

We've seen how svn lock and svn unlock can be used to create, release, break, and steal locks. This satisfies the goal of serializing commit access to a file. But what about the larger problem of preventing wasted time?

For example, suppose Harry locks an image file and then begins editing it. Meanwhile, miles away, Sally wants to do the same thing. She doesn't think to run svn status --show-updates, so she has no idea that Harry has already locked the file. She spends hours editing the file, and when she tries to commit her change, she discovers that either the file is locked or that she's out-of-date. Regardless, her changes aren't mergeable with Harry's. One of these two people has to throw away their work, and a lot of time has been wasted.

Subversion's solution to this problem is to provide a mechanism to remind users that a file ought to be locked before the editing begins. The mechanism is a special property, svn:needs-lock. If that property is attached to a file (regardless of its value, which is irrelevant), then Subversion will try to use filesystem-level permissions to make the file read-only, unless, of course, the user has explicitly locked the file. When a lock-token is present (as a result of running svn lock), the file becomes read-write. When the lock is released, the file becomes read-only again.

The theory, then, is that if the image file has this property attached, then Sally would immediately notice something is strange when she opens the file for editing. Many applications alert users immediately when a read-only file is opened for editing. And nearly all applications would at least prevent her from saving changes to the file. This reminds her to lock the file before editing, whereby she discovers the pre-existing lock:

$ /usr/local/bin/gimp raisin.jpg
gimp: error: file is read-only!
$ ls -l raisin.jpg
-r--r--r--   1 sally   sally   215589 Jun  8 19:23 raisin.jpg
$ svn lock raisin.jpg
svn: Lock request failed: 423 Locked (http://svn.example.com)
$ svn info http://svn.example.com/repos/project/raisin.jpg | grep Lock
Lock Token: opaquelocktoken:fc2b4dee-98f9-0310-abf3-653ff3226e6b
Lock Owner: harry
Lock Created: 2006-06-08 07:29:18 -0500 (Thu, 08 June 2006)
Lock Comment (1 line):
Making some tweaks.  Locking for the next two hours.
$

	п÷п╬п╢я│п╨п╟п╥п╨п╟
	Users and administrators alike are encouraged to attach the svn:needs-lock property to any file which cannot be contextually merged. This is the primary technique for encouraging good locking habits and preventing wasted effort.

Note that this property is a communication tool which works independently from the locking system. In other words, any file can be locked, whether or not this property is present. And conversely, the presence of this property doesn't make the repository require a lock when committing.

Unfortunately, the system isn't flawless. It's possible that even when a file has the property, the read-only reminder won't always work. Sometimes applications misbehave and б╚hijackб╩ the read-only file, silently allowing users to edit and save the file anyway. There's not much that Subversion can do in this situationБ─■at the end of the day, there's simply no substitution for good interpersonal communication. ^[21]

п║п╬п╥п╢п╟я┌я▄ п╡п╣я┌п╨я┐ п╬я┤п╣п╫я▄ п©я─п╬я│я┌п╬ Б─■ п©я─п╦ п©п╬п╪п╬я┴п╦ п╨п╬п╪п╟п╫п╢я▀ svn copy п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ я│п╬п╥п╢п╟п╣я┌я│я▐ п╨п╬п©п╦я▐ п©я─п╬п╣п╨я┌п╟. Subversion п╪п╬п╤п╣я┌ п╨п╬п©п╦я─п╬п╡п╟я┌я▄ п╫п╣ я┌п╬п╩я▄п╨п╬ п╬я┌п╢п╣п╩я▄п╫я▀п╣ я└п╟п╧п╩я▀, п╫п╬ п╦ я├п╣п╩я▀п╣ п╨п╟я┌п╟п╩п╬пЁп╦. п≤я┌п╟п╨, п╡п╟п╪ п╫я┐п╤п╫п╬ я│п╢п╣п╩п╟я┌я▄ п╨п╬п©п╦я▌ п╨п╟я┌п╟п╩п╬пЁп╟ /calc/trunk. п⌠п╢п╣ п╢п╬п╩п╤п╫п╟ п╩п╣п╤п╟я┌я▄ я█я┌п╟ п╫п╬п╡п╟я▐ п╨п╬п©п╦я▐? п⌠п╢п╣ я┐пЁп╬п╢п╫п╬ Б─■ я█я┌п╬я┌ п╡п╬п©я─п╬я│ п╬п©я─п╣п╢п╣п╩я▐п╣я┌я│я▐ п©я─п╟п╡п╦п╩п╟п╪п╦ п©я─п╬п╣п╨я┌п╟. п■п╬п©я┐я│я┌п╦п╪, я┤я┌п╬ п©п╬ п©я─п╟п╡п╦п╩п╟п╪ п╡п╟я┬п╣п╧ п╨п╬п╪п╟п╫п╢я▀ п╡п╣я┌п╨п╦ я│п╬п╥п╢п╟я▌я┌я│я▐ п╡ п╨п╟я┌п╟п╩п╬пЁп╣ /calc/branches я┘я─п╟п╫п╦п╩п╦я┴п╟, п╦ п╡я▀ я┘п╬я┌п╦я┌п╣ п╫п╟п╥п╡п╟я┌я▄ я│п╡п╬я▌ п╡п╣я┌п╨я┐ my-calc-branch. п╒п╬пЁп╢п╟ п╡п╟п╪ я│п╩п╣п╢я┐п╣я┌ я│п╬п╥п╢п╟я┌я▄ п╫п╬п╡я▀п╧ п╨п╟я┌п╟п╩п╬пЁ /calc/branches/my-calc-branch, п╨п╬я┌п╬я─я▀п╧ п╠я┐п╢п╣я┌ п╨п╬п©п╦п╣п╧ /calc/trunk.

п п╬п©п╦я▌ п╪п╬п╤п╫п╬ я│п╬п╥п╢п╟я┌я▄ п╢п╡я┐п╪я▐ я─п╟п╥п╩п╦я┤п╫я▀п╪п╦ я│п©п╬я│п╬п╠п╟п╪п╦. п║п©п╣я─п╡п╟ п╪я▀ п©п╬п╨п╟п╤п╣п╪ п╠п╬п╩п╣п╣ п╢п╩п╦п╫п╫я▀п╧ я│п©п╬я│п╬п╠, п©я─п╬я│я┌п╬ п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬ п╠я▀ п©п╬я▐я│п╫п╦я┌я▄ я│я┐я┌я▄ п╦п╢п╣п╦. п■п╩я▐ п╫п╟я┤п╟п╩п╟ я│п╬п╥п╢п╟п╢п╦п╪ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ п╨п╬я─п╫п╣п╡п╬пЁп╬ п╨п╟я┌п╟п╩п╬пЁп╟ п©я─п╬п╣п╨я┌п╟ /calc:

$ svn checkout http://svn.example.com/repos/calc bigwc
A  bigwc/trunk/
A  bigwc/trunk/Makefile
A  bigwc/trunk/integer.c
A  bigwc/trunk/button.c
A  bigwc/branches/
Checked out revision 340.

п╒п╣п©п╣я─я▄, я┤я┌п╬п╠я▀ я│п╬п╥п╢п╟я┌я▄ п╨п╬п©п╦я▌, п╢п╬я│я┌п╟я┌п╬я┤п╫п╬ п©я─п╬я│я┌п╬ п©п╣я─п╣п╢п╟я┌я▄ п╢п╡п╟ п©я┐я┌п╦ п╡ п©я─п╣п╢п╣п╩п╟я┘ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╨п╬п╪п╟п╫п╢п╣ svn copy:

$ cd bigwc
$ svn copy trunk branches/my-calc-branch
$ svn status
A  +   branches/my-calc-branch

п▓ я─п╣п╥я┐п╩я▄я┌п╟я┌п╣ п╨п╬п╪п╟п╫п╢п╟ svn copy я─п╣п╨я┐я─я│п╦п╡п╫п╬ п╨п╬п©п╦я─я┐п╣я┌ я─п╟п╠п╬я┤п╦п╧ п╨п╟я┌п╟п╩п╬пЁ trunk п╡ п╫п╬п╡я▀п╧ я─п╟п╠п╬я┤п╦п╧ п╨п╟я┌п╟п╩п╬пЁ branches/my-calc-branch. п╒п╣п©п╣я─я▄ п╨п╬п╪п╟п╫п╢п╟ svn status п©п╬п╨п╟п╤п╣я┌, я┤я┌п╬ п╫п╬п╡я▀п╧ п╨п╟я┌п╟п╩п╬пЁ п╥п╟п©п╩п╟п╫п╦я─п╬п╡п╟п╫ п╢п╩я▐ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▐ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣. п·п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ п╥п╫п╟п╨ б╚+б╩ п©п╬я│п╩п╣ п╠я┐п╨п╡я▀ п░. п·п╫ п╬п╥п╫п╟я┤п╟п╣я┌, я┤я┌п╬ п╥п╟п©п╩п╟п╫п╦я─п╬п╡п╟п╫п╫п╬п╣ п╢п╩я▐ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▐ п©я─п╣п╢я│я┌п╟п╡п╩я▐п╣я┌ я│п╬п╠п╬п╧ п╨п╟п╨я┐я▌-я┌п╬ п╨п╬п©п╦я▌, п╟ п╫п╣ я┤я┌п╬-я┌п╬ п╫п╬п╡п╬п╣. п÷я─п╦ я│п╩п╣п╢я┐я▌я┴п╣п╧ я└п╦п╨я│п╟я├п╦п╦ Subversion я│п╬п╥п╢п╟я│я┌ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ п╨п╟я┌п╟п╩п╬пЁ /calc/branches/my-calc-branch, я│п╨п╬п©п╦я─п╬п╡п╟п╡ п╣пЁп╬ п╦п╥ /calc/trunk п╡п╪п╣я│я┌п╬ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ п©п╬п╡я┌п╬я─п╫п╬ п╬я┌п©я─п╟п╡п╩я▐я┌я▄ п©п╬ я│п╣я┌п╦ п╡я│я▌ п╦п╫я└п╬я─п╪п╟я├п╦я▌ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦:

$ svn commit -m "Creating a private branch of /calc/trunk."
Adding         branches/my-calc-branch
Committed revision 341.

п░ я┌п╣п©п╣я─я▄ п©п╬п╨п╟п╤п╣п╪ п©я─п╬я│я┌п╬п╧ я│п©п╬я│п╬п╠ я│п╬п╥п╢п╟п╫п╦я▐ п╡п╣я┌п╨п╦, п╬ п╨п╬я┌п╬я─п╬п╪ п╪я▀ я┐п©п╬п╪п╦п╫п╟п╩п╦ я─п╟п╫я▄я┬п╣: п╨п╬п╪п╟п╫п╢п╟ svn copy п╪п╬п╤п╣я┌ п╬п©п╣я─п╦я─п╬п╡п╟я┌я▄ п╢п╡я┐п╪я▐ URL-п╟п╢я─п╣я│п╟п╪п╦ п╫п╟п©я─я▐п╪я┐я▌.

$ svn copy http://svn.example.com/repos/calc/trunk \
           http://svn.example.com/repos/calc/branches/my-calc-branch \
      -m "Creating a private branch of /calc/trunk."

Committed revision 341.

п▓ я│я┐я┴п╫п╬я│я┌п╦, п╪п╣п╤п╢я┐ я█я┌п╦п╪п╦ п╢п╡я┐п╪я▐ п╪п╣я┌п╬п╢п╟п╪п╦ п╫п╣я┌ я─п╟п╥п╫п╦я├я▀. п·п╠п╟ п╡п╟я─п╦п╟п╫я┌п╟ я│п╬п╥п╢п╟я▌я┌ п╡ п©я─п╟п╡п╨п╣ 341 п╫п╬п╡я▀п╧ п╨п╟я┌п╟п╩п╬пЁ, п╦ я█я┌п╬п╧ п╫п╬п╡я▀п╧ п╨п╟я┌п╟п╩п╬пЁ я▐п╡п╩я▐п╣я┌я│я▐ п╨п╬п©п╦п╣п╧ /calc/trunk. п╜я┌п╬ п©п╬п╨п╟п╥я▀п╡п╟п╣я┌ п═п╦я│я┐п╫п╬п╨б═4.3, б╚п╔я─п╟п╫п╦п╩п╦я┴п╣, я│п╬п╢п╣я─п╤п╟я┴п╣п╣ п╫п╬п╡я┐я▌ п╨п╬п©п╦я▌б╩. п·п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ я┌п╬, я┤я┌п╬ п╡я┌п╬я─п╬п╧ п╪п╣я┌п╬п╢, п╨я─п╬п╪п╣ п╡я│п╣пЁп╬ п©я─п╬я┤п╣пЁп╬, п╡я▀п©п╬п╩п╫я▐п╣я┌ п╫п╣п╪п╣п╢п╩п╣п╫п╫я┐я▌ я└п╦п╨я│п╟я├п╦я▌. ^[24]п╜я┌п╟ п©я─п╬я├п╣п╢я┐я─п╟ п╠п╬п╩п╣п╣ п©я─п╬я│я┌п╟ п╡ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦п╦, я┌п╟п╨ п╨п╟п╨ п╫п╣я┌ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬я│я┌п╦ п╡ п╡я▀пЁя─я┐п╥п╨п╣ п╡ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ п╥п╫п╟я┤п╦я┌п╣п╩я▄п╫п╬пЁп╬ п╬п╠я┼п╣п╪п╟ п╢п╟п╫п╫я▀я┘ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟. п÷п╬ я│я┐я┌п╦, п╡ я█я┌п╬п╪ я│п╩я┐я┤п╟п╣ п╪п╬п╤п╫п╬ п╡п╬п╡я│п╣ п╫п╣ п╦п╪п╣я┌я▄ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦.

п═п╦я│я┐п╫п╬п╨ 4.3. п╔я─п╟п╫п╦п╩п╦я┴п╣, я│п╬п╢п╣я─п╤п╟я┴п╣п╣ п╫п╬п╡я┐я▌ п╨п╬п©п╦я▌

п÷п╬я│п╩п╣ я│п╬п╥п╢п╟п╫п╦я▐ п╡п╣я┌п╨п╦ п©я─п╬п╣п╨я┌п╟ п╪п╬п╤п╫п╬ п╥п╟пЁя─я┐п╥п╦я┌я▄ п╫п╬п╡я┐я▌ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ п╦ п©я─п╦я│я┌я┐п©п╦я┌я▄ п╨ я─п╟п╠п╬я┌п╣ я│ п╫п╣п╧:

$ svn checkout http://svn.example.com/repos/calc/branches/my-calc-branch
A  my-calc-branch/Makefile
A  my-calc-branch/integer.c
A  my-calc-branch/button.c
Checked out revision 341.

п▓ я█я┌п╬п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╫п╣я┌ п╫п╦я┤п╣пЁп╬ п╬я│п╬п╠п╣п╫п╫п╬пЁп╬; я█я┌п╬ п©я─п╬я│я┌п╬ п╥п╣я─п╨п╟п╩п╬ п╢я─я┐пЁп╬пЁп╬ п╨п╟я┌п╟п╩п╬пЁп╟ я┘я─п╟п╫п╦п╩п╦я┴п╟. п·п╢п╫п╟п╨п╬, п╣я│п╩п╦ п║п╟п╩п╩п╦ п╬п╠п╫п╬п╡п╦я┌ я│п╡п╬я▌ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п╬п╫п╟ п╫п╣ я┐п╡п╦п╢п╦я┌ я┌п╟п╪ п╡п╟я┬п╦я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧. п═п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ п║п╟п╩п╩п╦ я│п╬п╥п╢п╟п╫п╟ п╦п╥ п╨п╟я┌п╟п╩п╬пЁп╟ /calc/trunk. (п║п╪п╬я┌я─п╦я┌п╣ п╢п╟п╩п╣п╣ п╡ я█я┌п╬п╧ пЁп╩п╟п╡п╣ я─п╟п╥п╢п╣п╩ б╚п÷п╣я─п╣п╨п╩я▌я┤п╣п╫п╦п╣ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦б╩: п╨п╬п╪п╟п╫п╢п╟ svn switch я▐п╡п╩я▐п╣я┌я│я▐ п╟п╩я▄я┌п╣я─п╫п╟я┌п╦п╡п╫я▀п╪ я│п©п╬я│п╬п╠п╬п╪ я│п╬п╥п╢п╟п╫п╦я▐ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╡п╣я┌п╨п╦.)

п÷я─п╣п╢п©п╬п╩п╬п╤п╦п╪, я┤я┌п╬ п╥п╟ п╫п╣п╢п╣п╩я▌ п╠я▀п╩п╦ я│п╢п╣п╩п╟п╫я▀ я│п╩п╣п╢я┐я▌я┴п╦п╣ я└п╦п╨я│п╟я├п╦п╦:

п╒п╣п©п╣я─я▄ я┐ я└п╟п╧п╩п╟ integer.c п╣я│я┌я▄ п╢п╡п╟ п╫п╣п╥п╟п╡п╦я│п╦п╪я▀я┘ п╫п╟п©я─п╟п╡п╩п╣п╫п╦я▐ я─п╟п╥я─п╟п╠п╬я┌п╨п╦, я┤я┌п╬ п╢п╣п╪п╬п╫я│я┌я─п╦я─я┐п╣я┌ п═п╦я│я┐п╫п╬п╨б═4.4, б╚п≤я│я┌п╬я─п╦я▐ п╡п╣я┌п╡п╩п╣п╫п╦я▐ п╢п╩я▐ п╬п╢п╫п╬пЁп╬ я└п╟п╧п╩п╟б╩.

п═п╦я│я┐п╫п╬п╨ 4.4. п≤я│я┌п╬я─п╦я▐ п╡п╣я┌п╡п╩п╣п╫п╦я▐ п╢п╩я▐ п╬п╢п╫п╬пЁп╬ я└п╟п╧п╩п╟

п∙я│п╩п╦ п©п╬я│п╪п╬я┌я─п╣я┌я▄ п╦я│я┌п╬я─п╦я▌ п╦п╥п╪п╣п╫п╣п╫п╦п╧, я│п╢п╣п╩п╟п╫п╫я▀я┘ п╡ п╡п╟я┬п╣п╧ п╨п╬п©п╦п╦ integer.c, п╪п╬п╤п╫п╬ я┐п╡п╦п╢п╣я┌я▄ п╦п╫я┌п╣я─п╣я│п╫я▀п╣ п╡п╣я┴п╦:

$ pwd
/home/user/my-calc-branch

$ svn log --verbose integer.c
------------------------------------------------------------------------
r343 | user | 2002-11-07 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines
Changed paths:
   M /calc/branches/my-calc-branch/integer.c

* integer.c:  frozzled the wazjub.

------------------------------------------------------------------------
r341 | user | 2002-11-03 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines
Changed paths:
   A /calc/branches/my-calc-branch (from /calc/trunk:340)

Creating a private branch of /calc/trunk.

------------------------------------------------------------------------
r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines
Changed paths:
   M /calc/trunk/integer.c

* integer.c:  changed a docstring.

------------------------------------------------------------------------
r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines
Changed paths:
   M /calc/trunk/integer.c

* integer.c:  adding this file to the project.

------------------------------------------------------------------------

п·п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ я┌п╬, я┤я┌п╬ Subversion п©п╬п╩п╫п╬я│я┌я▄я▌ п©я─п╬я│п╩п╣п╤п╦п╡п╟п╣я┌ п╡я│я▌ п╦я│я┌п╬я─п╦я▌ п╡п╣я┌п╨п╦ integer.c п╡п╬ п╡я─п╣п╪п╣п╫п╦, п╡ я┌п╬п╪ я┤п╦я│п╩п╣ п©п╣я─п╣я│п╣п╨п╟я▐ я┌п╬я┤п╨я┐ я│п╬п╥п╢п╟п╫п╦я▐ п╨п╬п©п╦п╦. п║п╬п╥п╢п╟п╫п╦п╣ п╡п╣я┌п╨п╦ п©п╬п╨п╟п╥п╟п╫п╬ п╨п╟п╨ я│п╬п╠я▀я┌п╦п╣ п╡ п╦я│я┌п╬я─п╦п╦, п©п╬я┌п╬п╪я┐ я┤я┌п╬ я└п╟п╧п╩ integer.c п╠я▀п╩ п╫п╣я▐п╡п╫п╬ я│п╨п╬п©п╦я─п╬п╡п╟п╫ п©я─п╦ п╨п╬п©п╦я─п╬п╡п╟п╫п╦п╦ п╡я│п╣пЁп╬ п╨п╟я┌п╟п╩п╬пЁп╟ /calc/trunk/. п╒п╣п©п╣я─я▄ п╢п╟п╡п╟п╧я┌п╣ п©п╬я│п╪п╬я┌я─п╦п╪, п╨п╟п╨п╬п╧ я─п╣п╥я┐п╩я▄я┌п╟я┌ п╡я▀п╢п╟я│я┌ я┌п╟п╨п╟я▐ п╤п╣ п╨п╬п╪п╟п╫п╢п╟ п╢п╩я▐ п║п╟п╩п╩п╦:

$ pwd
/home/sally/calc

$ svn log --verbose integer.c
------------------------------------------------------------------------
r344 | sally | 2002-11-07 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines
Changed paths:
   M /calc/trunk/integer.c

* integer.c:  fix a bunch of spelling errors.

------------------------------------------------------------------------
r303 | sally | 2002-10-29 21:14:35 -0600 (Tue, 29 Oct 2002) | 2 lines
Changed paths:
   M /calc/trunk/integer.c

* integer.c:  changed a docstring.

------------------------------------------------------------------------
r98 | sally | 2002-02-22 15:35:29 -0600 (Fri, 22 Feb 2002) | 2 lines
Changed paths:
   M /calc/trunk/integer.c

* integer.c:  adding this file to the project.

------------------------------------------------------------------------

п║п╟п╩п╩п╦ я┐п╡п╦п╢п╦я┌ я│п╡п╬п╦ я│п╬п╠я│я┌п╡п╣п╫п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ п©я─п╟п╡п╨п╣ 344, п╟ п╡п╟я┬п╦, я│п╢п╣п╩п╟п╫п╫я▀п╣ п╡ п©я─п╟п╡п╨п╣ 343 Б─■ п╫п╣я┌. Subversion п©п╬п╥п╟п╠п╬я┌п╦п╩п╟я│я▄ п╬ я┌п╬п╪, я┤я┌п╬п╠я▀ я█я┌п╦ п╢п╡п╣ я└п╦п╨я│п╟я├п╦п╦ п╥п╟я┌я─п╬п╫я┐п╩п╦ я─п╟п╥п╫я▀п╣ я└п╟п╧п╩я▀, п╦п╪п╣я▌я┴п╦п╣ я─п╟п╥п╫п╬п╣ я─п╟я│п©п╬п╩п╬п╤п╣п╫п╦п╣ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣. п╒п╣п╪ п╫п╣ п╪п╣п╫п╣п╣, Subversion п╠я┐п╢п╣я┌ п©п╬п╨п╟п╥я▀п╡п╟я┌я▄ я┌п╬, я┤я┌п╬ п╢п╡п╟ я└п╟п╧п╩п╟ п╦п╪п╣я▌я┌ п╬п╠я┴я┐я▌ п╦я│я┌п╬я─п╦я▌. п■п╬ я│п╬п╥п╢п╟п╫п╦я▐ п╡п╣я┌п╨п╦-п╨п╬п©п╦п╦ п╡ п©я─п╟п╡п╨п╣ 341 я█я┌п╬ п╠я▀п╩ п╬п╢п╦п╫ я└п╟п╧п╩. п÷п╬я█я┌п╬п╪я┐ п╦ п╡я▀, п╦ п║п╟п╩п╩п╦ п╡п╦п╢п╦я┌п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, я│п╢п╣п╩п╟п╫п╫я▀п╣ п╡ п©я─п╟п╡п╨п╟я┘ 303 п╦ 98.

п≤п╥ я█я┌п╬пЁп╬ я─п╟п╥п╢п╣п╩п╟ п╡я▀ п╢п╬п╩п╤п╫я▀ п╥п╟п©п╬п╪п╫п╦я┌я▄ п╢п╡п╣ п╡п╣я┴п╦.

п▓ п©я─п╣п╢я▀п╢я┐я┴п╣п╪ я─п╟п╥п╢п╣п╩п╣ п╪я▀ п╬я┌п╪п╣я┌п╦п╩п╦, я┤я┌п╬ п╦ п╡я▀, п╦ п║п╟п╩п╩п╦, п╬п╢п╫п╬п╡я─п╣п╪п╣п╫п╫п╬, п╡ я─п╟п╥п╫я▀я┘ п╡п╣я┌п╨п╟я┘ п╡п╫п╬я│п╦я┌п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я└п╟п╧п╩ integer.c. п∙я│п╩п╦ п©п╬я│п╪п╬я┌я─п╣я┌я▄ п╫п╟ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╣ п║п╟п╩п╩п╦ п╢п╩я▐ п©я─п╟п╡п╨п╦ 344, п╡я▀ я┐п╡п╦п╢п╦я┌п╣, я┤я┌п╬ п╬п╫п╟ п╦я│п©я─п╟п╡п╦п╩п╟ п╫п╣я│п╨п╬п╩я▄п╨п╬ п╬я─я└п╬пЁя─п╟я└п╦я┤п╣я│п╨п╦я┘ п╬я┬п╦п╠п╬п╨. п п╬п╫п╣я┤п╫п╬ п╤п╣, п╡ п╡п╟я┬п╣п╧ п╨п╬п©п╦п╦ я█я┌п╬пЁп╬ я└п╟п╧п╩п╟ я█я┌п╦ п╬я┬п╦п╠п╨п╦ п╬я│я┌п╟п╩п╦я│я▄. п²п╣ п╦я│п╨п╩я▌я┤п╣п╫п╬, я┤я┌п╬ п╡п╟я┬п╦ п╠я┐п╢я┐я┴п╦п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ я█я┌п╬пЁп╬ я└п╟п╧п╩п╟ п╨п╬я│п╫я┐я┌я│я▐ п╬п╠п╩п╟я│я┌п╣п╧, я│п╬п╢п╣я─п╤п╟я┴п╦я┘ я█я┌п╦ п╬я─я└п╬пЁя─п╟я└п╦я┤п╣я│п╨п╦п╣ п╬я┬п╦п╠п╨п╦, п╦ я┌п╟п╨п╦п╪ п╬п╠я─п╟п╥п╬п╪ п╡я▀ п©п╬п╩я┐я┤п╦я┌п╣ п╫п╣я│п╨п╬п╩я▄п╨п╬ п©п╬я┌п╣п╫я├п╦п╟п╩я▄п╫я▀я┘ п╨п╬п╫я└п╩п╦п╨я┌п╬п╡ п©я─п╦ п©п╬я│п╩п╣п╢я┐я▌я┴п╣п╪ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦п╦ п╡п╟я┬п╣п╧ п╡п╣я┌п╨п╦. п÷п╬я█я┌п╬п╪я┐ п╩я┐я┤я┬п╣ п©п╬п╩я┐я┤п╦я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╬я┌ п║п╟п╩п╩п╦ я│п╣п╧я┤п╟я│, п╢п╬ я┌п╬пЁп╬, п╨п╟п╨ п╡я▀ п╫п╟я┤п╫п╣я┌п╣ п╡п©п╩п╬я┌п╫я┐я▌ я─п╟п╠п╬я┌п╟я┌я▄ я│ я█я┌п╬п╧ я┤п╟я│я┌я▄я▌ я└п╟п╧п╩п╟.

п²п╟я│я┌п╟п╩ п╪п╬п╪п╣п╫я┌ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ п╨п╬п╪п╟п╫п╢п╬п╧ svn merge. п╜я┌п╟ п╨п╬п╪п╟п╫п╢п╟, п╬п╨п╟п╥я▀п╡п╟п╣я┌я│я▐, я▐п╡п╩я▐п╣я┌я│я▐ п╬я┤п╣п╫я▄ п╠п╩п╦п╥п╨п╦п╪ я─п╬п╢я│я┌п╡п╣п╫п╫п╦п╨п╬п╪ п╨п╬п╪п╟п╫п╢я▀ svn diff (п╬ п╨п╬я┌п╬я─п╬п╧ п╡я▀ я┤п╦я┌п╟п╩п╦ п╡ п⌠п╩п╟п╡п╟б═2, п╜п╨я│п╨я┐я─я│п╦я▐ п©п╬ Subversion). п·п╠п╣ п╨п╬п╪п╟п╫п╢я▀ я│п©п╬я│п╬п╠п╫я▀ я│я─п╟п╡п╫п╦п╡п╟я┌я▄ п╩я▌п╠я▀п╣ п╢п╡п╟ п╬п╠я┼п╣п╨я┌п╟ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ п╦ п©п╬п╨п╟п╥я▀п╡п╟я┌я▄ я─п╟п╥п╩п╦я┤п╦я▐. п²п╟п©я─п╦п╪п╣я─, п╡я▀ п╪п╬п╤п╣я┌п╣ п©п╬п©я─п╬я│п╦я┌я▄ svn diff п©п╬п╨п╟п╥п╟я┌я▄ п╡я│п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, я│п╢п╣п╩п╟п╫п╫я▀п╣ п║п╟п╩п╩п╦ п╡ п©я─п╟п╡п╨п╣ 344:

$ svn diff -r 343:344 http://svn.example.com/repos/calc/trunk

Index: integer.c
===================================================================
--- integer.c (revision 343)
+++ integer.c (revision 344)
@@ -147,7 +147,7 @@
     case 6:  sprintf(info->operating_system, "HPFS (OS/2 or NT)"); break;
     case 7:  sprintf(info->operating_system, "Macintosh"); break;
     case 8:  sprintf(info->operating_system, "Z-System"); break;
-    case 9:  sprintf(info->operating_system, "CPM"); break;
+    case 9:  sprintf(info->operating_system, "CP/M"); break;
     case 10:  sprintf(info->operating_system, "TOPS-20"); break;
     case 11:  sprintf(info->operating_system, "NTFS (Windows NT)"); break;
     case 12:  sprintf(info->operating_system, "QDOS"); break;
@@ -164,7 +164,7 @@
     low = (unsigned short) read_byte(gzfile);  /* read LSB */
     high = (unsigned short) read_byte(gzfile); /* read MSB */
     high = high << 8;  /* interpret MSB correctly */
-    total = low + high; /* add them togethe for correct total */
+    total = low + high; /* add them together for correct total */

     info->extra_header = (unsigned char *) my_malloc(total);
     fread(info->extra_header, total, 1, gzfile);
@@ -241,7 +241,7 @@
      Store the offset with ftell() ! */

   if ((info->data_offset = ftell(gzfile))== -1) {
-    printf("error: ftell() retturned -1.\n");
+    printf("error: ftell() returned -1.\n");
     exit(1);
   }

@@ -249,7 +249,7 @@
   printf("I believe start of compressed data is %u\n", info->data_offset);
   #endif

-  /* Set postion eight bytes from the end of the file. */
+  /* Set position eight bytes from the end of the file. */

   if (fseek(gzfile, -8, SEEK_END)) {
     printf("error: fseek() returned non-zero\n");

п п╬п╪п╟п╫п╢п╟ svn merge п╡п╣п╢п╣я┌ я│п╣п╠я▐ п©я─п╟п╨я┌п╦я┤п╣я│п╨п╦ п╦п╢п╣п╫я┌п╦я┤п╫п╬. п²п╬ п╡п╪п╣я│я┌п╬ п╡я▀п╡п╬п╢п╟ я─п╟п╥п╩п╦я┤п╦п╧ п╫п╟ я┌п╣я─п╪п╦п╫п╟п╩ п╬п╫п╟ п©я─п╦п╪п╣п╫я▐п╣я┌ п╦я┘ п╨ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╡ п╡п╦п╢п╣ п╩п╬п╨п╟п╩я▄п╫я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧:

$ svn merge -r 343:344 http://svn.example.com/repos/calc/trunk
U  integer.c

$ svn status
M  integer.c

п▓я▀п╡п╬п╢ п╨п╬п╪п╟п╫п╢я▀ svn merge п©п╬п╨п╟п╥я▀п╡п╟п╣я┌, я┤я┌п╬ п╨ п╡п╟я┬п╣п╧ п╨п╬п©п╦п╦ integer.c п╠я▀п╩ п©я─п╦п╪п╣п╫п╣п╫ п©п╟я┌я┤. п╒п╣п©п╣я─я▄ п╬п╫п╟ я│п╬п╢п╣я─п╤п╦я┌ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п║п╟п╩п╩п╦ Б─■ п╬п╫п╦ п╠я▀п╩п╦ б╚я│п╨п╬п©п╦я─п╬п╡п╟п╫я▀б╩ п╦п╥ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╦ я─п╟п╥я─п╟п╠п╬я┌п╨п╦ п╡ п╡п╟я┬я┐ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п╡п╟я┬я┐ я│п╬п╠я│я┌п╡п╣п╫п╫я┐я▌ п╡п╣я┌п╨я┐, п╦ я┌п╣п©п╣я─я▄ я│я┐я┴п╣я│я┌п╡я┐я▌я┌ п╡ п╡п╦п╢п╣ п╩п╬п╨п╟п╩я▄п╫я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧. п║ я█я┌п╬пЁп╬ п╪п╬п╪п╣п╫я┌п╟ п╡я▀ п╪п╬п╤п╣я┌п╣ п©я─п╬я│п╪п╬я┌я─п╣я┌я▄ п╩п╬п╨п╟п╩я▄п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╦ я┐п╠п╣п╢п╦я┌я▄я│я▐ п╡ я┌п╬п╪, я┤я┌п╬ п╬п╫п╦ п╨п╬я─я─п╣п╨я┌п╫я▀.

п▓п╬п╥п╪п╬п╤п╫п╟ я│п╦я┌я┐п╟я├п╦я▐, п╨п╬пЁп╢п╟ п╫п╣ п╡я│п╣ п╠я┐п╢п╣я┌ я┌п╟п╨ я┘п╬я─п╬я┬п╬ п╦ integer.c п╬п╨п╟п╤п╣я┌я│я▐ п╡ я│п╬я│я┌п╬я▐п╫п╦п╦ п╨п╬п╫я└п╩п╦п╨я┌п╟. п╒п╬пЁп╢п╟ п╡п╟п╪ п╠я┐п╢п╣я┌ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ я─п╟п╥я─п╣я┬п╦я┌я▄ п╨п╬п╫я└п╩п╦п╨я┌ п╬п╠я▀я┤п╫я▀п╪ п©я┐я┌п╣п╪ (я│п╪. п⌠п╩п╟п╡п╟б═2, п╜п╨я│п╨я┐я─я│п╦я▐ п©п╬ Subversion), п╩п╦п╠п╬, п╣я│п╩п╦ п╡я▀ п©я─п╦п╢п╣я┌п╣ п╨ п╪п╫п╣п╫п╦я▌, я┤я┌п╬ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦п╣ п╠я▀п╩п╬ п©п╩п╬я┘п╬п╧ п╦п╢п╣п╣п╧, п©я─п╬я│я┌п╬ п╬я┌п╨п╟п╥п╟я┌я▄я│я▐ п╬я┌ п╫п╣пЁп╬, п╬я┌п╪п╣п╫п╦п╡ п╩п╬п╨п╟п╩я▄п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╨п╬п╪п╟п╫п╢п╬п╧ svn revert.

п÷я─п╬я│п╪п╬я┌я─п╣п╡ я─п╣п╥я┐п╩я▄я┌п╟я┌ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦я▐ п╦я│п©я─п╟п╡п╩п╣п╫п╦п╧, п╣пЁп╬ п╪п╬п╤п╫п╬ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟я┌я▄ п╨п╟п╨ п╬п╠я▀я┤п╫п╬ (svn commit). п÷п╬я│п╩п╣ я█я┌п╬пЁп╬ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╠я┐п╢я┐я┌ п╡п╫п╣я│п╣п╫я▀ п╡ п╡п╟я┬я┐ п╡п╣я┌п╨я┐ я┘я─п╟п╫п╦п╩п╦я┴п╟. п▓ я┌п╣я─п╪п╦п╫п╬п╩п╬пЁп╦п╦ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╡п╣я─я│п╦я▐п╪п╦ я┌п╟п╨я┐я▌ п©я─п╬я├п╣п╢я┐я─я┐ п╨п╬п©п╦я─п╬п╡п╟п╫п╦я▐ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╪п╣п╤п╢я┐ п╡п╣я┌п╨п╟п╪п╦ п╬п╠я▀я┤п╫п╬ п╫п╟п╥я▀п╡п╟я▌я┌ п©п╬я─я┌п╦я─п╬п╡п╟п╫п╦п╣п╪ п╦п╥п╪п╣п╫п╣п╫п╦п╧.

п÷я─п╦ я└п╦п╨я│п╟я├п╦п╦ п╩п╬п╨п╟п╩я▄п╫я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧ я┐п╠п╣п╢п╦я┌п╣я│я▄, я┤я┌п╬ п╡ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╦ я┐п©п╬п╪п╦п╫п╟п╣я┌я│я▐ п╬ п©п╬я─я┌п╦я─п╬п╡п╟п╫п╦п╦ п╬я┌п╢п╣п╩я▄п╫я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╦п╥ п╬п╢п╫п╬п╧ п╡п╣я┌п╨п╦ п╡ п╢я─я┐пЁя┐я▌. п²п╟п©я─п╦п╪п╣я─:

$ svn commit -m "integer.c: ported r344 (spelling fixes) from trunk."
Sending        integer.c
Transmitting file data .
Committed revision 360.

п п╟п╨ п╡я▀ я┐п╡п╦п╢п╦я┌п╣ п╡ п©п╬я│п╩п╣п╢я┐я▌я┴п╦я┘ я─п╟п╥п╢п╣п╩п╟я┘, п╬я┤п╣п╫я▄ п╡п╟п╤п╫п╬ я│п╩п╣п╢п╬п╡п╟я┌я▄ я█я┌п╬п╧ б╚я┘п╬я─п╬я┬п╣п╧ п©я─п╟п╨я┌п╦п╨п╣б╩.

$ svn diff -r 343:344 http://svn.example.com/repos/calc/trunk > patchfile
$ patch -p0  < patchfile
Patching file integer.c using Plan A...
Hunk #1 succeeded at 147.
Hunk #2 succeeded at 164.
Hunk #3 succeeded at 241.
Hunk #4 succeeded at 249.
done

п²п╣п╠п╬п╩я▄я┬п╬п╣ п©я─п╣п╢я┐п©я─п╣п╤п╢п╣п╫п╦п╣: п╫п╣я│п╪п╬я┌я─я▐ п╫п╟ я┌п╬, я┤я┌п╬ svn diff п╦ svn merge п©п╬ я│я┐я┌п╦ п╬я┤п╣п╫я▄ п©п╬я┘п╬п╤п╦, п╡п╬ п╪п╫п╬пЁп╦я┘ я│п╩я┐я┤п╟я▐я┘ п╬п╫п╦ п╦я│п©п╬п╩я▄п╥я┐я▌я┌ я─п╟п╥п╫я▀п╧ я│п╦п╫я┌п╟п╨я│п╦я│. п·п╠я▐п╥п╟я┌п╣п╩я▄п╫п╬ п©я─п╬я┤я┌п╦я┌п╣ п╬п╠ я█я┌п╬п╪ п╡ п⌠п╩п╟п╡п╟б═9, п÷п╬п╩п╫п╬п╣ я│п©я─п╟п╡п╬я┤п╫п╬п╣ я─я┐п╨п╬п╡п╬п╢я│я┌п╡п╬ п©п╬ Subversion, п╦п╩п╦ я│п©я─п╬я│п╦я┌п╣ я┐ svn help. п²п╟п©я─п╦п╪п╣я─, svn merge я┌я─п╣п╠я┐п╣я┌ п╡ п╨п╟я┤п╣я│я┌п╡п╣ я├п╣п╩п╣п╡п╬пЁп╬ п╬п╠я┼п╣п╨я┌п╟ п©я┐я┌я▄ п╡ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, я┌п╬ п╣я│я┌я▄ п╪п╣я│я┌п╬, пЁп╢п╣ п╣п╧ п╫я┐п╤п╫п╬ п©я─п╦п╪п╣п╫п╦я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐ я│я┌я─я┐п╨я┌я┐я─я▀ я└п╟п╧п╩п╬п╡. п∙я│п╩п╦ я├п╣п╩п╣п╡п╬п╧ п╬п╠я┼п╣п╨я┌ п╫п╣ я┐п╨п╟п╥п╟п╫, п©я─п╣п╢п©п╬п╩п╟пЁп╟п╣я┌я│я▐, я┤я┌п╬ п╢п╣п╩п╟п╣я┌я│я▐ п©п╬п©я▀я┌п╨п╟ п╡я▀п©п╬п╩п╫п╦я┌я▄ п╬п╢п╫я┐ п╦п╥ я│п╩п╣п╢я┐я▌я┴п╦я┘ п╬п©п╣я─п╟я├п╦п╧:

п∙я│п╩п╦ п╡я▀ п╬п╠я┼п╣п╢п╦п╫я▐п╣я┌п╣ п╨п╟я┌п╟п╩п╬пЁ п╦ п╫п╣ я┐п╨п╟п╥я▀п╡п╟п╣я┌п╣ я├п╣п╩п╣п╡п╬п╧ п©я┐я┌я▄, svn merge п©я─п╣п╢п©п╬п╩п╟пЁп╟п╣я┌ п©п╣я─п╡я▀п╧ п╦п╥ п©я─п╦п╡п╣п╢п╣п╫п╫я▀я┘ п╡я▀я┬п╣ п╡п╟я─п╦п╟п╫я┌п╬п╡ п╦ п©я▀я┌п╟п╣я┌я│я▐ п©я─п╦п╪п╣п╫п╦я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╨ я┌п╣п╨я┐я┴п╣п╪я┐ п╨п╟я┌п╟п╩п╬пЁя┐. п∙я│п╩п╦ п╡я▀ п╬п╠я┼п╣п╢п╦п╫я▐п╣я┌п╣ я└п╟п╧п╩, п╦ п©я─п╦ я█я┌п╬п╪ я└п╟п╧п╩ я│ я┌п╟п╨п╦п╪ п╦п╪п╣п╫п╣п╪ п╣я│я┌я▄ п╡ я┌п╣п╨я┐я┴п╣п╪ я─п╟п╠п╬я┤п╣п╪ п╨п╟я┌п╟п╩п╬пЁп╣, svn merge п©п╬п╢я─п╟п╥я┐п╪п╣п╡п╟п╣я┌ п╡я┌п╬я─п╬п╧ я│п╩я┐я┤п╟п╧ п╦ п©я▀я┌п╟п╣я┌я│я▐ п©я─п╦п╪п╣п╫п╦я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╨ п╩п╬п╨п╟п╩я▄п╫п╬п╪я┐ я└п╟п╧п╩я┐ я│ я┌п╟п╨п╦п╪ п╤п╣ п╦п╪п╣п╫п╣п╪.

п∙я│п╩п╦ п╡я▀ я┘п╬я┌п╦я┌п╣ п©я─п╦п╪п╣п╫п╦я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╨ я┤п╣п╪я┐-я┌п╬ п╢я─я┐пЁп╬п╪я┐, п╡п╟п╪ п╫я┐п╤п╫п╬ я█я┌п╬ я┐п╨п╟п╥п╟я┌я▄. п²п╟п©я─п╦п╪п╣я─, п╣я│п╩п╦ п╡я▀ п╫п╟я┘п╬п╢п╦я┌п╣я│я▄ п╡ я─п╬п╢п╦я┌п╣п╩я▄я│п╨п╬п╪ п╨п╟я┌п╟п╩п╬пЁп╣ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, я┌п╬ п╡п╟п╪ п╫я┐п╤п╫п╬ я┐п╨п╟п╥п╟я┌я▄ я├п╣п╩п╣п╡п╬п╧ п╨п╟я┌п╟п╩п╬пЁ, п©п╬п╩я┐я┤п╟я▌я┴п╦п╧ п╦п╥п╪п╣п╫п╣п╫п╦я▐:

$ svn merge -r 343:344 http://svn.example.com/repos/calc/trunk my-calc-branch
U   my-calc-branch/integer.c

п╒п╣п©п╣я─я▄, п©п╬я│п╩п╣ п╥п╫п╟п╨п╬п╪я│я┌п╡п╟ я│ п©я─п╦п╪п╣я─п╟п╪п╦ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ svn merge, п╫п╟я│я┌п╟п╩п╟ п©п╬я─п╟ я─п╟п╥п╬п╠я─п╟я┌я▄я│я▐ п╡ п╫п╦я┘ п©п╬пЁп╩я┐п╠п╤п╣. п∙я│п╩п╦ п╡я▀ я┤я┐п╡я│я┌п╡я┐п╣я┌п╣ п╫п╣я┐п╡п╣я─п╣п╫п╫п╬я│я┌я▄ п╡ я┌п╬п╪ п╨п╟п╨, я│п╬п╠я│я┌п╡п╣п╫п╫п╬, я─п╟п╠п╬я┌п╟п╣я┌ я│п╩п╦я▐п╫п╦п╣, я┌п╬ п╡я▀ п╡ я█я┌п╬п╪ п╡я▀ п╫п╣ п╬п╢п╦п╫п╬п╨п╦. п°п╫п╬пЁп╦п╣ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╦ (п╬я│п╬п╠п╣п╫п╫п╬ я┌п╣, п╢п╩я▐ п╨п╬я┌п╬я─я▀я┘ я┐п©я─п╟п╡п╩п╣п╫п╦п╣ п╡п╣я─я│п╦я▐п╪п╦ п╡ п╫п╬п╡п╦п╫п╨я┐) п©п╬п╫п╟я┤п╟п╩я┐ п©я┐я┌п╟я▌я┌я│я▐ п╡ п©я─п╟п╡п╦п╩я▄п╫п╬я│я┌п╦ п╥п╟п©п╦я│п╦ я█я┌п╬п╧ п╨п╬п╪п╟п╫п╢я▀ п╦ п╡ я┌п╬п╪, п╨п╟п╨ п╦ п╨п╬пЁп╢п╟ я█я┌я┐ я└я┐п╫п╨я├п╦я▌ я│п╩п╣п╢я┐п╣я┌ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄. п·я┌п╠я─п╬я│я▄я┌п╣ я│я┌я─п╟я┘ Б─■ п╫п╟ я│п╟п╪п╬п╪ п╢п╣п╩п╣ я█я┌п╟ п╨п╬п╪п╟п╫п╢п╟ п╫п╟п╪п╫п╬пЁп╬ п©я─п╬я┴п╣, я┤п╣п╪ п╡я▀ п╢я┐п╪п╟п╣я┌п╣! п÷п╬п╫я▐я┌я▄, п╨п╟п╨ п╦п╪п╣п╫п╫п╬ п╡п╣п╢п╣я┌ я│п╣п╠я▐ svn merge, п╬я┤п╣п╫я▄ п©я─п╬я│я┌п╬.

п▓ я│я┌я┐п©п╬я─ п╡п╡п╬п╢п╦я┌, пЁп╩п╟п╡п╫я▀п╪ п╬п╠я─п╟п╥п╬п╪, п╫п╟п╥п╡п╟п╫п╦п╣ п╨п╬п╪п╟п╫п╢я▀. п╒п╣я─п╪п╦п╫ б╚я│п╩п╦я▐п╫п╦п╣б╩ п╨п╟п╨ п╠я▀ я┐п╨п╟п╥я▀п╡п╟п╣я┌ п╫п╟ я┌п╬, я┤я┌п╬ п╡п╣я┌п╨п╦ я│п╬п╣п╢п╦п╫я▐я▌я┌я│я▐ п╡п╪п╣я│я┌п╣, п╦п╩п╦ п©я─п╬п╦я│я┘п╬п╢п╦я┌ п╨п╟п╨п╬п╣-я┌п╬ п╡п╬п╩я┬п╣п╠п╫п╬п╣ я│п╪п╣я┬п╦п╡п╟п╫п╦п╣ п╢п╟п╫п╫я▀я┘. п²п╟ я│п╟п╪п╬п╪ п╢п╣п╩п╣ я█я┌п╬ п╫п╣ я┌п╟п╨. п÷п╬п╤п╟п╩я┐п╧, я█я┌п╬п╧ п╨п╬п╪п╟п╫п╢п╣ п╩я┐я┤я┬п╣ п╠я▀ п©п╬п╢п╬я┴п╩п╬ п╫п╟п╥п╡п╟п╫п╦п╣ svn diff-and-apply, п©п╬я│п╨п╬п╩я▄п╨я┐ я█я┌п╬ п╡я│я▒, я┤я┌п╬ п╡ я─п╣п╥я┐п╩я▄я┌п╟я┌п╣ п©я─п╬п╦я│я┘п╬п╢п╦я┌: я│я─п╟п╡п╫п╦п╡п╟я▌я┌я│я▐ п╢п╡п╟ я└п╟п╧п╩п╬п╡я▀я┘ п╢п╣я─п╣п╡п╟ я┘я─п╟п╫п╦п╩п╦я┴п╟, п╟ я─п╟п╥п╩п╦я┤п╦я▐ п©п╣я─п╣п╫п╬я│я▐я┌я│я▐ п╡ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌.

п п╬п╪п╟п╫п╢п╟ п©я─п╦п╫п╦п╪п╟п╣я┌ я┌я─п╦ п╟я─пЁя┐п╪п╣п╫я┌п╟:

п п╬пЁп╢п╟ я█я┌п╦ я┌я─п╦ п╟я─пЁя┐п╪п╣п╫я┌п╟ я┐п╨п╟п╥п╟п╫я▀, п©я─п╬п╦п╥п╡п╬п╢п╦я┌я│я▐ я│я─п╟п╡п╫п╣п╫п╦п╣ п╢п╡я┐я┘ п╢п╣я─п╣п╡я▄п╣п╡, п╟ п©п╬п╩я┐я┤п╣п╫п╫я▀п╣ я─п╟п╥п╩п╦я┤п╦я▐ п©я─п╦п╪п╣п╫я▐я▌я┌я│я▐ п╨ я├п╣п╩п╣п╡п╬п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╡ п╡п╦п╢п╣ п╩п╬п╨п╟п╩я▄п╫я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧. п÷п╬я│п╩п╣ п╡я▀п©п╬п╩п╫п╣п╫п╦я▐ я█я┌п╬п╧ п╨п╬п╪п╟п╫п╢я▀ я─п╣п╥я┐п╩я▄я┌п╟я┌ п╠я┐п╢п╣я┌ я┌п╟п╨ п╤п╣, п╨п╟п╨ п╡ я│п╩я┐я┤п╟п╣, п╣я│п╩п╦ п╠я▀ п╡я▀ п╡я─я┐я┤п╫я┐я▌ я─п╣п╢п╟п╨я┌п╦я─п╬п╡п╟п╩п╦ я└п╟п╧п╩я▀ п╦п╩п╦ п╪п╫п╬пЁп╬п╨я─п╟я┌п╫п╬ п╡я▀п©п╬п╩п╫я▐п╩п╦ п╨п╬п╪п╟п╫п╢я▀ svn add п╦п╩п╦ svn delete. п∙я│п╩п╦ я─п╣п╥я┐п╩я▄я┌п╟я┌ п╡п╟я│ я┐я│я┌я─п╟п╦п╡п╟п╣я┌, п╣пЁп╬ п╪п╬п╤п╫п╬ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟я┌я▄. п∙я│п╩п╦ я─п╣п╥я┐п╩я▄я┌п╟я┌ п╡п╟я│ п╫п╣ я┐я│я┌я─п╟п╦п╡п╟п╣я┌, п©я─п╬я│я┌п╬ п╬я┌п╪п╣п╫п╦я┌п╣ (svn revert) п╡я│п╣ я│п╢п╣п╩п╟п╫п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐.

п║п╦п╫я┌п╟п╨я│п╦я│ svn merge п©п╬п╥п╡п╬п╩я▐п╣я┌ я┐п╨п╟п╥я▀п╡п╟я┌я▄ я█я┌п╦ я┌я─п╦ п╟я─пЁя┐п╪п╣п╫я┌п╟ п╢п╬п╡п╬п╩я▄п╫п╬ пЁп╦п╠п╨п╬. п▓п╬я┌ п╫п╣я│п╨п╬п╩я▄п╨п╬ п©я─п╦п╪п╣я─п╬п╡:

      
$ svn merge http://svn.example.com/repos/branch1@150 \
            http://svn.example.com/repos/branch2@212 \
            my-working-copy

$ svn merge -r 100:200 http://svn.example.com/repos/trunk my-working-copy

$ svn merge -r 100:200 http://svn.example.com/repos/trunk

п▓ п©п╣я─п╡п╬п╪ п╡п╟я─п╦п╟п╫я┌п╣ п╡я│п╣ я┌я─п╦ п╟я─пЁя┐п╪п╣п╫я┌п╟ я┐п╨п╟п╥п╟п╫я▀ я▐п╡п╫п╬ Б─■ п╨п╟п╤п╢п╬п╣ п╢п╣я─п╣п╡п╬ п╥п╟п╢п╟п╫п╬ п╡ я└п╬я─п╪п╣ URL@REV п╦ я┐п╨п╟п╥п╟п╫п╟ я├п╣п╩п╣п╡п╟я▐ я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐. п▓я┌п╬я─п╬п╧ п╡п╟я─п╦п╟п╫я┌ п╪п╬п╤п╣я┌ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ п╢п╩я▐ п╨я─п╟я┌п╨п╬я│я┌п╦ п╥п╟п©п╦я│п╦ п╡ я│п╦я┌я┐п╟я├п╦я▐я┘, п╨п╬пЁп╢п╟ я│я─п╟п╡п╫п╦п╡п╟я▌я┌я│я▐ п╢п╡п╣ я─п╟п╥п╫я▀я┘ п©я─п╟п╡п╨п╦ п©п╬ п╬п╢п╫п╬п╪я┐ п╦ я┌п╬п╪я┐ п╤п╣ URL. п÷п╬я│п╩п╣п╢п╫п╦п╧ п╡п╟я─п╦п╟п╫я┌ п╢п╣п╪п╬п╫я│я┌я─п╦я─я┐п╣я┌ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п╫п╣ я┐п╨п╟п╥я▀п╡п╟я┌я▄ я├п╣п╩п╣п╡я┐я▌ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п©я─п╦ я█я┌п╬п╪ п©п╬ я┐п╪п╬п╩я┤п╟п╫п╦я▌ п╦я│п©п╬п╩я▄п╥я┐п╣я┌я│я▐ я┌п╣п╨я┐я┴п╦п╧ п╨п╟я┌п╟п╩п╬пЁ.

п╖я┌п╬п╠я▀ п╥п╟п╨п╬п╫я┤п╦я┌я▄ я│ п©п╬я│п╩п╣п╢п╫п╦п╪ п©я─п╦п╪п╣я─п╬п╪, п╥п╟пЁп╩я▐п╫п╣п╪ п╫п╣п╪п╫п╬пЁп╬ п╡п©п╣я─п╣п╢. п÷я─п╣п╢п©п╬п╩п╬п╤п╦п╪, я┤я┌п╬ п©я─п╬я┬п╩п╬ п╫п╣я│п╨п╬п╩я▄п╨п╬ п╢п╫п╣п╧. п≤ п╡ пЁп╩п╟п╡п╫я┐я▌ п╩п╦п╫п╦я▌ я─п╟п╥я─п╟п╠п╬я┌п╨п╦, п╦ п╡п╟я┬я┐ п╩п╦я┤п╫я┐я▌ п╡п╣я┌п╨я┐ п╥п╟ я█я┌п╬ п╡я─п╣п╪я▐ п╠я▀п╩п╬ п╡п╫п╣я│п╣п╫п╬ п╪п╫п╬п╤п╣я│я┌п╡п╬ п╦п╥п╪п╣п╫п╣п╫п╦п╧. п■п╬п©я┐я│я┌п╦п╪, я┤я┌п╬ я─п╟п╠п╬я┌я┐ п╫п╟п╢ я│п╡п╬п╣п╧ п╡п╣я┌п╨п╬п╧ п╡я▀ п╥п╟п╡п╣я─я┬п╦п╩п╦. п²п╬п╡я▀п╧ я└я┐п╫п╨я├п╦п╬п╫п╟п╩ п╢п╬п╠п╟п╡п╩п╣п╫, п╬я┬п╦п╠п╨п╦ п╦я│п©я─п╟п╡п╩п╣п╫я▀, п╦ я┌п╣п©п╣я─я▄ п╡я▀ я┘п╬я┌п╦я┌п╣ п╬п╠я┼п╣п╢п╦п╫п╦я┌я▄ п╡я│п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╦п╥ я│п╡п╬п╣п╧ п╡п╣я┌п╨п╦ я│ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╣п╧ я─п╟п╥я─п╟п╠п╬я┌п╨п╦.

п п╟п╨ п©я─п╦п╪п╣п╫п╦я┌я▄ п╡ я█я┌п╬п╪ я│п╩я┐я┤п╟п╣ svn merge? п÷п╬п╪п╫п╦я┌п╣ п╬ я┌п╬п╪, я┤я┌п╬ я█я┌п╟ п╨п╬п╪п╟п╫п╢п╟ я│я─п╟п╡п╫п╦п╡п╟п╣я┌ п╢п╡п╟ п╢п╣я─п╣п╡п╟ п╦ п©я─п╦п╪п╣п╫я▐п╣я┌ я─п╟п╥п╩п╦я┤п╦я▐ п╨ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦. п║п╩п╣п╢п╬п╡п╟я┌п╣п╩я▄п╫п╬, п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬п╠я▀ п╠я▀п╩п╬ п╨ я┤п╣п╪я┐ п©я─п╦п╪п╣п╫я▐я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п╦п╪п╣я┌я▄ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╦ я─п╟п╥я─п╟п╠п╬я┌п╨п╦. п▒я┐п╢п╣п╪ я│я┤п╦я┌п╟я┌я▄, я┤я┌п╬ я┌п╟п╨п╟я▐, п©п╬п╩п╫п╬я│я┌я▄я▌ п╬п╠п╫п╬п╡п╩п╣п╫п╫п╟я▐ п╨п╬п©п╦я▐ я┐ п╡п╟я│ п╩п╦п╠п╬ я┐п╤п╣ п╣я│я┌я▄, п╩п╦п╠п╬ п╡я▀ п╣п╣ я┌п╬п╩я▄п╨п╬ я┤я┌п╬ я│п╬п╥п╢п╟п╩п╦ п╡ п╨п╟я┌п╟п╩п╬пЁп╣ /calc/trunk.

п²п╬ п╨п╟п╨п╦п╣ п╦п╪п╣п╫п╫п╬ п╢п╡п╟ п╢п╣я─п╣п╡п╟ п╫я┐п╤п╫п╬ я│я─п╟п╡п╫п╦п╡п╟я┌я▄? п²п╟ п©п╣я─п╡я▀п╧ п╡п╥пЁп╩я▐п╢ п╬я┌п╡п╣я┌ п╬я┤п╣п╡п╦п╢п╣п╫: п╫я┐п╤п╫п╬ я│я─п╟п╡п╫п╦я┌я▄ п©п╬я│п╩п╣п╢п╫п╣п╣ п╢п╣я─п╣п╡п╬ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╦ я─п╟п╥я─п╟п╠п╬я┌п╨п╦ я│ п©п╬я│п╩п╣п╢п╫п╦п╪ п╢п╣я─п╣п╡п╬п╪ п╡п╟я┬п╣п╧ п╡п╣я┌п╨п╦. п·п╢п╫п╟п╨п╬ я┌п╟п╨п╬п╣ п©я─п╣п╢п©п╬п╩п╬п╤п╣п╫п╦п╣ п╠я┐п╢п╣я┌ п╬я┬п╦п╠п╬я┤п╫я▀п╪. п╜я┌п╬ я┌п╦п©п╦я┤п╫п╟я▐ п╬я┬п╦п╠п╨п╟ п╠п╬п╩я▄я┬п╦п╫я│я┌п╡п╟ п╫п╬п╡п╦я┤п╨п╬п╡! п÷п╬я│п╨п╬п╩я▄п╨я┐ svn merge я─п╟п╠п╬я┌п╟п╣я┌ я┌п╟п╨ п╤п╣ п╨п╟п╨ п╦ svn diff, я│я─п╟п╡п╫п╣п╫п╦п╣ п©п╬я│п╩п╣п╢п╫п╣п╧ п╡п╣я─я│п╦п╦ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╦ я─п╟п╥я─п╟п╠п╬я┌п╨п╦ п╦ п╡п╟я┬п╣п╧ п╡п╣я┌п╨п╦ п©п╬п╨п╟п╤п╣я┌ п╦п╥п╪п╣п╫п╣п╫п╦я▐, я│п╢п╣п╩п╟п╫п╫я▀п╣ п╫п╣ я┌п╬п╩я▄п╨п╬ п╡ п╡п╟я┬п╣п╧ п╡п╣я┌п╨п╣. п╒п╟п╨п╬п╣ я│я─п╟п╡п╫п╣п╫п╦п╣ п©п╬п╨п╟п╤п╣я┌ я│п╩п╦я┬п╨п╬п╪ п╪п╫п╬пЁп╬ п╦п╥п╪п╣п╫п╣п╫п╦п╧. п·п╫п╬ п╡я▀п╡п╣п╢п╣я┌ п╫п╣ я┌п╬п╩я▄п╨п╬ я┌п╬, я┤я┌п╬ п╢п╬п╠п╟п╡п╩я▐п╩п╬я│я▄ п╡ п╡п╟я┬п╣п╧ п╡п╣я┌п╨п╣, п╫п╬ п╦ я┌п╬, я┤я┌п╬ я┐п╢п╟п╩я▐п╩п╬я│я▄ п╡ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╦ я─п╟п╥я─п╟п╠п╬я┌п╨п╦ п╦ п╫п╣ я┐п╢п╟п╩я▐п╩п╬я│я▄ п╡ п╡п╟я┬п╣п╧ п╡п╣я┌п╨п╣.

п╖я┌п╬п╠я▀ п╡я▀п╢п╣п╩п╦я┌я▄ я┌п╬п╩я▄п╨п╬ я┌п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╨п╬я┌п╬я─я▀п╣ п╠я▀п╩п╦ я│п╢п╣п╩п╟п╫я▀ п╡ п╡п╟я┬п╣п╧ п╡п╣я┌п╨п╣, п╫я┐п╤п╫п╬ я│я─п╟п╡п╫п╦п╡п╟я┌я▄ п╫п╟я┤п╟п╩я▄п╫п╬п╣ п╦ п╨п╬п╫п╣я┤п╫п╬п╣ я│п╬я│я┌п╬я▐п╫п╦я▐ я█я┌п╬п╧ п╡п╣я┌п╨п╦. п÷п╬я│п╪п╬я┌я─п╣п╡ svn log, п╪п╬п╤п╫п╬ я┐п╥п╫п╟я┌я▄, я┤я┌п╬ п╡п╣я┌п╨п╟ п╠я▀п╩п╟ я│п╬п╥п╢п╟п╫п╟ п╡ п©я─п╟п╡п╨п╣ 341. п▓ п╨п╟я┤п╣я│я┌п╡п╣ п╨п╬п╫п╣я┤п╫п╬пЁп╬ я│п╬я│я┌п╬я▐п╫п╦я▐ п╡п╣я┌п╨п╦ п╪п╬п╤п╫п╬ п©я─п╬я│я┌п╬ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п©я─п╟п╡п╨я┐ HEAD. п╜я┌п╬ п╥п╫п╟я┤п╦я┌, я┤я┌п╬ п╡п╟п╪ п╫я┐п╤п╫п╬ я│я─п╟п╡п╫п╦я┌я▄ п©я─п╟п╡п╨п╦ 341 п╦ HEAD п╨п╟я┌п╟п╩п╬пЁп╟ я│ п╡п╣я┌п╨п╬п╧ п╦ п©я─п╦п╪п╣п╫п╦я┌я▄ я─п╟п╥п╩п╦я┤п╦я▐ п╨ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╦ я─п╟п╥я─п╟п╠п╬я┌п╨п╦.

п÷п╬п╢я│п╨п╟п╥п╨п╟

п■п╩я▐ п╬п©я─п╣п╢п╣п╩п╣п╫п╦я▐ п©я─п╟п╡п╨п╦, п╡ п╨п╬я┌п╬я─п╬п╧ п╠я▀п╩п╟ я│п╬п╥п╢п╟п╫п╟ п╡п╣я┌п╨п╟ (б╚п╠п╟п╥п╬п╡п╬п╧б╩ п©я─п╟п╡п╨п╦ п╡п╣я┌п╨п╦), я┐п╢п╬п╠п╫п╬ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ п©п╟я─п╟п╪п╣я┌я─ --stop-on-copy п╨п╬п╪п╟п╫п╢я▀ svn log. п·п╠я▀я┤п╫п╬ я█я┌п╟ п╨п╬п╪п╟п╫п╢п╟ п©п╬п╨п╟п╥я▀п╡п╟п╣я┌ п╡я│п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐, я│п╢п╣п╩п╟п╫п╫я▀п╣ п╡ п╡п╣я┌п╨п╣, п╡п╨п╩я▌я┤п╟я▐ я┌п╣, п╨п╬я┌п╬я─я▀п╣ п╠я▀п╩п╦ я│п╢п╣п╩п╟п╫я▀ п╢п╬ я│п╬п╥п╢п╟п╫п╦я▐ п╡п╣я┌п╨п╦. п÷п╬я█я┌п╬п╪я┐ п╡я▀ п╠я┐п╢п╣я┌п╣ п╡п╦п╢п╣я┌я▄ п╦ п╦я│я┌п╬я─п╦я▌ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╦ я─п╟п╥я─п╟п╠п╬я┌п╨п╦. п÷п╟я─п╟п╪п╣я┌я─ --stop-on-copy п╬я│я┌п╟п╫п╬п╡п╦я┌ п╡я▀п╡п╬п╢ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╧, п╨п╟п╨ я┌п╬п╩я▄п╨п╬ svn log п╬п╠п╫п╟я─я┐п╤п╦я┌ я└п╟п╨я┌ п╨п╬п©п╦я─п╬п╡п╟п╫п╦я▐ п╦п╩п╦ п©п╣я─п╣п╦п╪п╣п╫п╬п╡п╟п╫п╦я▐ я├п╣п╩п╣п╡п╬пЁп╬ п╬п╠я┼п╣п╨я┌п╟. $ svn log --verbose --stop-on-copy \ http://svn.example.com/repos/calc/branches/my-calc-branch Б─╕ ------------------------------------------------------------------------ r341 | user | 2002-11-03 15:27:56 -0600 (Thu, 07 Nov 2002) | 2 lines Changed paths: A /calc/branches/my-calc-branch (from /calc/trunk:340) $ п п╟п╨ п╦ п╬п╤п╦п╢п╟п╩п╬я│я▄, п©п╬я│п╩п╣п╢п╫п╣п╧ я│я┌я─п╬я┤п╨п╬п╧ я█я┌п╟ п╨п╬п╪п╟п╫п╢п╟ п╡я▀п╡п╣п╢п╣я┌ я┌я┐ п©я─п╟п╡п╨я┐, п╡ п╨п╬я┌п╬я─п╬п╧ п╡ я─п╣п╥я┐п╩я▄я┌п╟я┌п╣ п╨п╬п©п╦я─п╬п╡п╟п╫п╦я▐ п╠я▀п╩ я│п╬п╥п╢п╟п╫ п╨п╟я┌п╟п╩п╬пЁ my-calc-branch.

п╒п╣п©п╣я─я▄ п╪я▀ п╪п╬п╤п╣п╪ п╥п╟п╡п╣я─я┬п╦я┌я▄ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦п╣ п╡п╣я┌п╬п╨:

$ cd calc/trunk
$ svn update
At revision 405.

$ svn merge -r 341:405 http://svn.example.com/repos/calc/branches/my-calc-branch
U   integer.c
U   button.c
U   Makefile

$ svn status
M   integer.c
M   button.c
M   Makefile

# ...examine the diffs, compile, test, etc...

$ svn commit -m "Merged my-calc-branch changes r341:405 into the trunk."
Sending        integer.c
Sending        button.c
Sending        Makefile
Transmitting file data ...
Committed revision 406.

п∙я┴п╣ я─п╟п╥ п╬п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣ п╫п╟ я┌п╬, я┤я┌п╬ п╡ п╩п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╦ я└п╦п╨я│п╟я├п╦п╦ п╬я┤п╣п╫я▄ я┌п╬я┤п╫п╬ я┐п╨п╟п╥п╟п╫ п╢п╦п╟п©п╟п╥п╬п╫ п©я─п╟п╡п╬п╨, п╨п╬я┌п╬я─я▀п╣ п╠я▀п╩п╦ п╬п╠я┼п╣п╢п╦п╫п╣п╫я▀ я│ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╣п╧ я─п╟п╥я─п╟п╠п╬я┌п╨п╦. п²п╦п╨п╬пЁп╢п╟ п╫п╣ п╥п╟п╠я▀п╡п╟п╧я┌п╣ я█я┌п╬пЁп╬ п╢п╣п╩п╟я┌я▄, п©п╬я┌п╬п╪я┐ я┤я┌п╬ я█я┌п╬ п╬я┤п╣п╫я▄ п╡п╟п╤п╫п╟я▐ п╦п╫я└п╬я─п╪п╟я├п╦я▐, п╨п╬я┌п╬я─п╟я▐ п©п╬п╫п╟п╢п╬п╠п╦я┌я▄я│я▐ п╡п╟п╪ п©п╬п╥п╤п╣.

п÷я─п╣п╢п©п╬п╩п╬п╤п╦п╪, я┤я┌п╬ п╫п╟ я│п╩п╣п╢я┐я▌я┴п╣п╧ п╫п╣п╢п╣п╩п╣ п╡я▀ я─п╣я┬п╦п╩п╦ п©я─п╬п╢п╬п╩п╤п╦я┌я▄ я─п╟п╠п╬я┌я┐ п╫п╟п╢ я│п╡п╬п╣п╧ п╡п╣я┌п╨п╬п╧, я┤я┌п╬п╠я▀ п╢п╬я─п╟п╠п╬я┌п╟я┌я▄ п╫п╬п╡я▀п╧ я└я┐п╫п╨я├п╦п╬п╫п╟п╩ п╦п╩п╦ п╦я│п©я─п╟п╡п╦я┌я▄ п╣я┴п╣ п╫п╣я│п╨п╬п╩я▄п╨п╬ п╬я┬п╦п╠п╬п╨. п╒п╣п©п╣я─я▄ п©я─п╟п╡п╨п╟ HEAD я┘я─п╟п╫п╦п╩п╦я┴п╟ п╦п╪п╣п╣я┌ п╫п╬п╪п╣я─ 480, п╦ п╡я▀ пЁп╬я┌п╬п╡я▀ п╣я┴п╣ я─п╟п╥ п╬п╠я┼п╣п╢п╦п╫п╦я┌я▄ я│п╡п╬я▌ п╩п╦я┤п╫я┐я▌ п╨п╬п©п╦я▌ я│ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╣п╧ я─п╟п╥я─п╟п╠п╬я┌п╨п╦. п·п╢п╫п╟п╨п╬, п╨п╟п╨ я┐п╤п╣ п╠я▀п╩п╬ я│п╨п╟п╥п╟п╫п╬ п╡ я─п╟п╥п╢п╣п╩п╣ б╚п п╟п╨ п©я─п╟п╡п╦п╩я▄п╫п╣п╣ п╡я│п╣пЁп╬ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ я│п╩п╦я▐п╫п╦п╣б╩, я─п╟п╫п╣п╣ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╫п╣ я│я┌п╬п╦я┌ п╬п╠я┼п╣п╢п╦п╫я▐я┌я▄ п©п╬п╡я┌п╬я─п╫п╬. п·п╠я┼п╣п╢п╦п╫п╣п╫п╦я▌ п©п╬п╢п╩п╣п╤п╟я┌ я┌п╬п╩я▄п╨п╬ б╚п╫п╬п╡я▀п╣б╩ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п©п╬я▐п╡п╦п╡я┬п╦п╣я│я▐ я│ п╪п╬п╪п╣п╫я┌п╟ п©п╬я│п╩п╣п╢п╫п╣пЁп╬ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦я▐. п║п╩п╬п╤п╫п╬я│я┌я▄ п╥п╟п╨п╩я▌я┤п╟п╣я┌я│я▐ п╡ я┌п╬п╪, я┤я┌п╬п╠я▀ п╡я▀п╢п╣п╩п╦я┌я▄ я█я┌п╦ п╫п╬п╡я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐.

п÷п╣я─п╡я▀п╪ я┬п╟пЁп╬п╪ п╠я┐п╢п╣я┌ п╥п╟п©я┐я│п╨ svn log п╢п╩я▐ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╦ я─п╟п╥я─п╟п╠п╬я┌п╨п╦, п╡ я─п╣п╥я┐п╩я▄я┌п╟я┌п╣ я┤п╣пЁп╬ п╪я▀ я┐п╥п╫п╟п╣п╪ п╡я─п╣п╪я▐ п©п╬я│п╩п╣п╢п╫п╣пЁп╬ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦я▐ я│ п╡п╣я┌п╨п╬п╧:

$ cd calc/trunk
$ svn log
Б─╕
------------------------------------------------------------------------
r406 | user | 2004-02-08 11:17:26 -0600 (Sun, 08 Feb 2004) | 1 line

Merged my-calc-branch changes r341:405 into the trunk.
------------------------------------------------------------------------
Б─╕

п░пЁп╟! п▓я│п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡п╣я┌п╨п╦, я│п╢п╣п╩п╟п╫п╫я▀п╣ п╪п╣п╤п╢я┐ п©я─п╟п╡п╨п╟п╪п╦ 341 п╦ 405, я┐п╤п╣ п╠я▀п╩п╦ п╬п╠я┼п╣п╢п╦п╫п╣п╫я▀ я│ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╣п╧ я─п╟п╥я─п╟п╠п╬я┌п╨п╦ п╡ п©я─п╟п╡п╨п╣ 406. п÷п╬я█я┌п╬п╪я┐ я│п╣п╧я┤п╟я│ п╫п╟п╪ п╫я┐п╤п╫п╬ п╡п╥я▐я┌я▄ я┌п╬п╩я▄п╨п╬ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╡я▀п©п╬п╩п╫п╣п╫п╫я▀п╣ п©п╬я│п╩п╣ я█я┌п╬пЁп╬. п■п╩я▐ я█я┌п╬пЁп╬ п╪я▀ п╠я┐п╢п╣п╪ я│я─п╟п╡п╫п╦п╡п╟я┌я▄ п©я─п╟п╡п╨п╦ 406 п╦ HEAD.

$ cd calc/trunk
$ svn update
At revision 480.

# We notice that HEAD is currently 480, so we use it to do the merge:

$ svn merge -r 406:480 http://svn.example.com/repos/calc/branches/my-calc-branch
U   integer.c
U   button.c
U   Makefile

$ svn commit -m "Merged my-calc-branch changes r406:480 into the trunk."
Sending        integer.c
Sending        button.c
Sending        Makefile
Transmitting file data ...
Committed revision 481.

п╒п╣п©п╣я─я▄ пЁп╩п╟п╡п╫п╟я▐ п╩п╦п╫п╦я▐ я─п╟п╥я─п╟п╠п╬я┌п╨п╦ п©п╬п╩п╫п╬я│я┌я▄я▌ я│п╬п╢п╣я─п╤п╦я┌ п╡я┌п╬я─я┐я▌ п╡п╬п╩п╫я┐ п╦п╥п╪п╣п╫п╣п╫п╦п╧, я│п╢п╣п╩п╟п╫п╫я▀я┘ п╡ п╡п╣я┌п╨п╣. п╒п╣п©п╣я─я▄ п╪п╬п╤п╫п╬ п╩п╦п╠п╬ я┐п╢п╟п╩п╦я┌я▄ п╡п╣я┌п╨я┐ (п╬п╠ я█я┌п╬п╪ п╪я▀ п©п╬пЁп╬п╡п╬я─п╦п╪ п©п╬п╥п╤п╣), п╩п╦п╠п╬ п©я─п╬п╢п╬п╩п╤п╦я┌я▄ я─п╟п╠п╬я┌я┐ п╫п╟п╢ п╫п╣п╧, п©п╣я─п╦п╬п╢п╦я┤п╣я│п╨п╦ п©п╬п╡я┌п╬я─я▐я▐ п©я─п╦ я█я┌п╬п╪ п©я─п╬я├п╣п╢я┐я─я┐ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦я▐.

п∙я┴п╣ п╬п╢п╫п╬п╧ я┌п╦п©п╦я┤п╫п╬п╧ п╥п╟п╢п╟я┤п╣п╧ п╢п╩я▐ svn merge я▐п╡п╩я▐п╣я┌я│я▐ п╬я┌п╨п╟я┌ я─п╟п╫п╣п╣ я│п╢п╣п╩п╟п╫п╫я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧. п÷я─п╣п╢п©п╬п╩п╬п╤п╦п╪, я─п╟п╠п╬я┌п╟я▐ п╡ п╨п╬п©п╦п╦ /calc/trunk, п╡я▀ п╡п╢я─я┐пЁ п╡я▀я▐я│п╫я▐п╣я┌п╣, я┤я┌п╬ п╦п╥п╪п╣п╫п╣п╫п╦я▐ я└п╟п╧п╩п╟ integer.c, я│п╢п╣п╩п╟п╫п╫я▀п╣ п╡ п©я─п╟п╡п╨п╣ 303, п╠я▀п╩п╦ я│п╬п╡п╣я─я┬п╣п╫п╫п╬ п╬я┬п╦п╠п╬я┤п╫я▀п╪п╦. п▓я▀ п╪п╬п╤п╣я┌п╣ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ п╨п╬п╪п╟п╫п╢п╬п╧ svn merge п╢п╩я▐ б╚п╬я┌п╪п╣п╫я▀б╩ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╡ я│п╡п╬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦, п©п╬я│п╩п╣ я┤п╣пЁп╬ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟я┌я▄ п╩п╬п╨п╟п╩я▄п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣. п■п╩я▐ я█я┌п╬пЁп╬ п╫я┐п╤п╫п╬ п╡я│п╣пЁп╬ п╩п╦я┬я▄ я┐п╨п╟п╥п╟я┌я▄ я─п╟п╥п╩п╦я┤п╦я▐ п╡ п╬п╠я─п╟я┌п╫п╬п╪ п©п╬я─я▐п╢п╨п╣:

$ svn merge -r 303:302 http://svn.example.com/repos/calc/trunk
U  integer.c

$ svn status
M  integer.c

$ svn diff
Б─╕
# verify that the change is removed
Б─╕

$ svn commit -m "Undoing change committed in r303."
Sending        integer.c
Transmitting file data .
Committed revision 350.

п÷я─п╟п╡п╨я┐ я┘я─п╟п╫п╦п╩п╦я┴п╟ п╪п╬п╤п╫п╬ я─п╟я│я│п╪п╟я┌я─п╦п╡п╟я┌я▄ п╨п╟п╨ пЁя─я┐п©п©я┐ п╦п╥п╪п╣п╫п╣п╫п╦п╧ (п╫п╣п╨п╬я┌п╬я─я▀п╣ я│п╦я│я┌п╣п╪я▀ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╡п╣я─я│п╦я▐п╪п╦ п╫п╟п╥я▀п╡п╟я▌я┌ я█я┌п╬ п╫п╟п╠п╬я─п╬п╪ п╦п╥п╪п╣п╫п╣п╫п╦п╧). п≤я│п©п╬п╩я▄п╥я┐я▐ п©п╟я─п╟п╪п╣я┌я─ -r, п╪п╬п╤п╫п╬ п©п╬п©я─п╬я│п╦я┌я▄ svn merge п©я─п╦п╪п╣п╫п╦я┌я▄ п╨ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╫п╟п╠п╬я─ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╦п╩п╦ я├п╣п╩я▀п╧ п╢п╦п╟п©п╟п╥п╬п╫ п╫п╟п╠п╬я─п╬п╡ п╦п╥п╪п╣п╫п╣п╫п╦п╧. п▓ п╫п╟я┬п╣п╪ п©я─п╦п╪п╣я─п╣ я│ п╬я┌п╪п╣п╫п╬п╧ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╪я▀ п©я─п╬я│п╦п╪ svn merge п©я─п╦п╪п╣п╫п╦я┌я▄ п╨ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╫п╟п╠п╬я─ п╦п╥п╪п╣п╫п╣п╫п╦п╧ #303 п╡ п╬п╠я─п╟я┌п╫п╬п╪ п╫п╟п©я─п╟п╡п╩п╣п╫п╦п╦.

п·п╠я─п╟я┌п╦я┌п╣ п╡п╫п╦п╪п╟п╫п╦п╣, я┤я┌п╬ п©п╬п╢п╬п╠п╫я▀п╧ п╬я┌п╨п╟я┌ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╫п╦я┤п╣п╪ п╫п╣ п╬я┌п╩п╦я┤п╟п╣я┌я│я▐ п╬я┌ п╬я│я┌п╟п╩я▄п╫я▀я┘ п╬п©п╣я─п╟я├п╦п╧, п╡я▀п©п╬п╩п╫я▐п╣п╪я▀я┘ я│ п©п╬п╪п╬я┴я▄я▌ svn merge. п÷п╬я█я┌п╬п╪я┐ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ я│ п©п╬п╪п╬я┴я▄я▌ svn status п╦ svn diff я┐п╠п╣п╢п╦я┌я▄я│я▐ п╡ я┌п╬п╪, я┤я┌п╬ я─п╣п╥я┐п╩я▄я┌п╟я┌ я│п╬п╬я┌п╡п╣я┌я│я┌п╡я┐п╣я┌ п╬п╤п╦п╢п╟п╫п╦я▐п╪, п╟ п╥п╟я┌п╣п╪, п╦я│п©п╬п╩я▄п╥я┐я▐ svn commit, п╬я┌п©я─п╟п╡п╦я┌я▄ я└п╦п╫п╟п╩я▄п╫я┐я▌ п╡п╣я─я│п╦я▌ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣. п÷п╬я│п╩п╣ я└п╦п╨я│п╟я├п╦п╦ я█я┌п╬я┌ п╨п╬п╫п╨я─п╣я┌п╫я▀п╧ п╫п╟п╠п╬я─ п╦п╥п╪п╣п╫п╣п╫п╦п╧ п╠п╬п╩я▄я┬п╣ п╫п╣ п╠я┐п╢п╣я┌ п╬я┌я─п╟п╤п╣п╫ п╡ п©я─п╟п╡п╨п╣ HEAD.

п■п╟п╡п╟п╧я┌п╣, п╬п╢п╫п╟п╨п╬, п©п╬п╢я┐п╪п╟п╣п╪: п╬я┌п╪п╣п╫я▐п╣я┌я│я▐ п╩п╦ п╫п╟ я│п╟п╪п╬п╪ п╢п╣п╩п╣ п©я─п╣п╢я▀п╢я┐я┴п╟я▐ я└п╦п╨я│п╟я├п╦я▐? п≤п╥п╪п╣п╫п╣п╫п╦я▐ п©я─п╬п╢п╬п╩п╤п╟я▌я┌ я│я┐я┴п╣я│я┌п╡п╬п╡п╟я┌я▄ п╡ п©я─п╟п╡п╨п╣ 303. п≤ п╣я│п╩п╦ п╨я┌п╬-я┌п╬ я│п╬п╥п╢п╟я│я┌ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌ п©я─п╬п╣п╨я┌п╟ calc п╪п╣п╤п╢я┐ п©я─п╟п╡п╨п╟п╪п╦ 303 п╦ 349, п╬п╫ п╡п╣п╢я▄ п╡я│п╣ я─п╟п╡п╫п╬ п©п╬п╩я┐я┤п╦я┌ п╬я┬п╦п╠п╬я┤п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐?

п▒п╣п╥я┐я│п╩п╬п╡п╫п╬, я█я┌п╬ я┌п╟п╨. п⌠п╬п╡п╬я─я▐ п╬п╠ б╚я┐п╢п╟п╩п╣п╫п╦п╦б╩ п╦п╥п╪п╣п╫п╣п╫п╦п╧, п╪я▀ п╦п╪п╣п╣п╪ п╡ п╡п╦п╢я┐ п╦я┘ я┐п╢п╟п╩п╣п╫п╦п╣ п╦п╥ п©я─п╟п╡п╨п╦ HEAD. п≤я│я┘п╬п╢п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п©п╬-п©я─п╣п╤п╫п╣п╪я┐ п╬я│я┌п╟п╫я┐я┌я│я▐ п╡ п╦я│я┌п╬я─п╦п╦ я┘я─п╟п╫п╦п╩п╦я┴п╟. п╖п╟я┴п╣ п╡я│п╣пЁп╬ я█я┌п╬ п╪п╬п╤п╫п╬ я─п╟я│я│п╪п╟я┌я─п╦п╡п╟я┌я▄ п╢п╟п╤п╣ п╨п╟п╨ п©п╬п╩п╬п╤п╦я┌п╣п╩я▄п╫я▀п╧ п╪п╬п╪п╣п╫я┌. п▓ п╩я▌п╠п╬п╪ я│п╩я┐я┤п╟п╣, п╠п╬п╩я▄я┬п╦п╫я│я┌п╡п╬ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╣п╧ п╦п╫я┌п╣я─п╣я│я┐п╣я┌ я┌п╬п╩я▄п╨п╬ HEAD-п©я─п╟п╡п╨п╟ п©я─п╬п╣п╨я┌п╟. п·п╢п╫п╟п╨п╬, п╡п╬п╥п╪п╬п╤п╫я▀ я│п╦я┌я┐п╟я├п╦п╦, п╨п╬пЁп╢п╟ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п©п╬п╩п╫п╬я│я┌я▄я▌ я┐п╢п╟п╩п╦я┌я▄ п©п╬я│п╩п╣п╢я│я┌п╡п╦я▐ я└п╦п╨я│п╟я├п╦п╦. (п²п╟п©я─п╦п╪п╣я─, п╣я│п╩п╦ п╨я┌п╬-я┌п╬ я│п╩я┐я┤п╟п╧п╫п╬ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟п╩ п╨п╬п╫я└п╦п╢п╣п╫я├п╦п╟п╩я▄п╫я▀п╧ п╢п╬п╨я┐п╪п╣п╫я┌.) п║п╢п╣п╩п╟я┌я▄ я█я┌п╬ п╠я┐п╢п╣я┌ п╫п╣п©я─п╬я│я┌п╬, я┌п╟п╨ п╨п╟п╨ п╟я─я┘п╦я┌п╣п╨я┌я┐я─п╟ Subversion п╫п╟п╪п╣я─п╣п╫п╫п╬ п╦я│п╨п╩я▌я┤п╟п╣я┌ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п©п╬я┌п╣я─п╦ п╦п╫я└п╬я─п╪п╟я├п╦п╦. п÷я─п╟п╡п╨п╦ п©я─п╣п╢я│я┌п╟п╡п╩я▐я▌я┌ я│п╬п╠п╬п╧ п╫п╣ п╪п╣п╫я▐я▌я┴п╦п╣я│я▐ п╢п╣я─п╣п╡я▄я▐ я└п╟п╧п╩п╬п╡, п╬я│п╫п╬п╡п╟п╫п╫я▀п╣ п╢я─я┐пЁ п╫п╟ п╢я─я┐пЁп╣. пёп╢п╟п╩п╣п╫п╦п╣ п©я─п╟п╡п╨п╦ п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟ п╪п╬п╤п╣я┌ п╡я▀п╥п╡п╟я┌я▄ я█я└я└п╣п╨я┌ п╢п╬п╪п╦п╫п╬, п©п╬я┌п╟я┴п╦п╡ п╥п╟ я│п╬п╠п╬п╧ п╡я│п╣ п©п╬я│п╩п╣п╢я┐я▌я┴п╦п╣ п©я─п╟п╡п╨п╦ п╦ п©п╬п╡я─п╣п╢п╦п╡ п╡я│п╣ я─п╟п╠п╬я┤п╦п╣ п╨п╬п©п╦п╦. ^[26]

п·я┌п╩п╦я┤п╫я▀п╪ я│п╡п╬п╧я│я┌п╡п╬п╪ я│п╦я│я┌п╣п╪я▀ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╡п╣я─я│п╦я▐п╪п╦ я▐п╡п╩я▐п╣я┌я│я▐ я┌п╬, я┤я┌п╬ п╦п╫я└п╬я─п╪п╟я├п╦я▐ п╫п╦п╨п╬пЁп╢п╟ п╫п╣ я┌п╣я─я▐п╣я┌я│я▐. п÷я─п╦ я┐п╢п╟п╩п╣п╫п╦п╦ я└п╟п╧п╩п╟ п╦п╩п╦ п╨п╟я┌п╟п╩п╬пЁп╟ я█п╩п╣п╪п╣п╫я┌ п╦я│п╨п╩я▌я┤п╟п╣я┌я│я▐ п╦п╥ п©я─п╟п╡п╨п╦ HEAD, п╫п╬ п©я─п╬п╢п╬п╩п╤п╟п╣я┌ я│я┐я┴п╣я│я┌п╡п╬п╡п╟я┌я▄ п╡ п╠п╬п╩п╣п╣ я─п╟п╫п╫п╦я┘ п©я─п╟п╡п╨п╟я┘. п²п╬п╡я▀п╣ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╦ п╬я┤п╣п╫я▄ я┤п╟я│я┌п╬ я│п©я─п╟я┬п╦п╡п╟я▌я┌: б╚п п╟п╨ п╪п╫п╣ п╡п╣я─п╫я┐я┌я▄ п╫п╟п╥п╟п╢ я│п╡п╬п╧ я└п╟п╧п╩ п╦п╩п╦ п╨п╟я┌п╟п╩п╬пЁ?б╩

п■п╩я▐ п╫п╟я┤п╟п╩п╟ п╠я▀п╩п╬ п╠я▀ п╫п╣п©п╩п╬я┘п╬ п╬п©я─п╣п╢п╣п╩п╦я┌я▄я│я▐, п╨п╟п╨п╬п╧ п╦п╪п╣п╫п╫п╬ я█п╩п╣п╪п╣п╫я┌ п╪я▀ п©я▀я┌п╟п╣п╪я│я▐ п╡п╬я│я│я┌п╟п╫п╬п╡п╦я┌я▄. п■п╩я▐ я█я┌п╬пЁп╬ п©п╬п╩п╣п╥п╫п╬ п©я─п╣п╢я│я┌п╟п╡п╦я┌я▄ п╡я│п╣ п╬п╠я┼п╣п╨я┌я▀ я┘я─п╟п╫п╦п╩п╦я┴п╟ п╨п╟п╨ я┌п╬я┤п╨п╦ п╡ п╢п╡я┐п╪п╣я─п╫п╬п╧ я│п╦я│я┌п╣п╪п╣ п╨п╬п╬я─п╢п╦п╫п╟я┌. п÷п╣я─п╡п╬п╧ п╨п╬п╬я─п╢п╦п╫п╟я┌п╬п╧ п╠я┐п╢п╣я┌ п╬я┌п╢п╣п╩я▄п╫п╬п╣ п╢п╣я─п╣п╡п╬ п©я─п╟п╡п╬п╨, п╡ п╡я┌п╬я─п╬п╧ Б─■ п©я┐я┌я▄ п╡ я█я┌п╬п╪ п╢п╣я─п╣п╡п╣. п╒п╟п╨п╦п╪ п╬п╠я─п╟п╥п╬п╪, п╨п╟п╤п╢п╟я▐ п╡п╣я─я│п╦я▐ я└п╟п╧п╩п╟ п╦п╩п╦ п╨п╟я┌п╟п╩п╬пЁп╟ п╪п╬п╤п╣я┌ п╠я▀я┌я▄ п╥п╟п╢п╟п╫п╟ п©п╟я─п╬п╧ п╨п╬п╬я─п╢п╦п╫п╟я┌.

п▓ п╬я┌п╩п╦я┤п╦п╣ п╬я┌ CVS, Subversion п╫п╣ п╦п╪п╣п╣я┌ п╨п╟я┌п╟п╩п╬пЁп╟ Attic^[27], п©п╬я█я┌п╬п╪я┐ п╢п╩я▐ п╬п©я─п╣п╢п╣п╩п╣п╫п╦я▐ п╦я│п╨п╬п╪п╬п╧ п©п╟я─я▀ п╨п╬п╬я─п╢п╦п╫п╟я┌ п╡п╬я│я│я┌п╟п╫п╟п╡п╩п╦п╡п╟п╣п╪п╬пЁп╬ п╬п╠я┼п╣п╨я┌п╟ п╫я┐п╤п╫п╬ п╡я▀п╥п╡п╟я┌я▄ svn log. п⌡я┐я┤я┬п╣ п╡я│п╣пЁп╬ п╥п╟п©я┐я│я┌п╦я┌я▄ svn log --verbose п╡ п╨п╟я┌п╟п╩п╬пЁп╣, п╨п╬я┌п╬я─я▀п╧ я│п╬п╢п╣я─п╤п╟п╩ я┐п╢п╟п╩п╣п╫п╫я▀п╧ п╬п╠я┼п╣п╨я┌. п÷п╟я─п╟п╪п╣я┌я─ --verbose п©п╬п╨п╟п╤п╣я┌ п╢п╩я▐ п╨п╟п╤п╢п╬п╧ п©я─п╟п╡п╨п╦ я│п©п╦я│п╬п╨ п╦п╥п╪п╣п╫п╣п╫п╫я▀я┘ я█п╩п╣п╪п╣п╫я┌п╬п╡ Б─■ п╡ я█я┌п╬п╪ я│п╩я┐я┤п╟п╣ п╡п╟п╪ п╬я│я┌п╟п╫п╣я┌я│я▐ я┌п╬п╩я▄п╨п╬ п╫п╟п╧я┌п╦ я┌я┐ п©я─п╟п╡п╨я┐, п╡ п╨п╬я┌п╬я─п╬п╧ я└п╟п╧п╩ п╦п╩п╦ п╨п╟я┌п╟п╩п╬пЁ п╠я▀п╩п╦ я┐п╢п╟п╩п╣п╫я▀. п╜я┌п╬ п╪п╬п╤п╫п╬ я│п╢п╣п╩п╟я┌я▄ п╡п╦п╥я┐п╟п╩я▄п╫п╬ п╦п╩п╦ п╬п╠я─п╟п╠п╬я┌п╟п╡ п╡я▀п╡п╬п╢ п╨п╬п╪п╟п╫п╢я▀ п╨п╟п╨п╦п╪-п╫п╦п╠я┐п╢я▄ п╦п╫я│я┌я─я┐п╪п╣п╫я┌п╬п╪ (п╫п╟п©я─п╦п╪п╣я─, я┐я┌п╦п╩п╦я┌п╬п╧ grep п╦п╩п╦ п©я─п╬я│я┌п╬ п╥п╟п©я┐я│я┌п╦п╡ п©п╬п╦я│п╨ п╡ я─п╣п╢п╟п╨я┌п╬я─п╣).

$ cd parent-dir
$ svn log --verbose
Б─╕
------------------------------------------------------------------------
r808 | joe | 2003-12-26 14:29:40 -0600 (Fri, 26 Dec 2003) | 3 lines
Changed paths:
   D /calc/trunk/real.c
   M /calc/trunk/integer.c

Added fast fourier transform functions to integer.c.
Removed real.c because code now in double.c.
Б─╕

п▓ я█я┌п╬п╪ п©я─п╦п╪п╣я─п╣ п©я─п╣п╢п©п╬п╩п╟пЁп╟п╣я┌я│я▐, я┤я┌п╬ п╡я▀ п╦я┴п╣я┌п╣ я┐п╢п╟п╩п╣п╫п╫я▀п╧ я└п╟п╧п╩ real.c. п÷я─п╬я│п╪п╬я┌я─п╣п╡ п╩п╬пЁп╦ я─п╬п╢п╦я┌п╣п╩я▄я│п╨п╬пЁп╬ п╨п╟я┌п╟п╩п╬пЁп╟, п╡я▀ п╪п╬п╤п╣я┌п╣ п╥п╟п╪п╣я┌п╦я┌я▄, я┤я┌п╬ я█я┌п╬я┌ я└п╟п╧п╩ п╠я▀п╩ я┐п╢п╟п╩п╣п╫ п╡ п©я─п╟п╡п╨п╣ 808. п║п╩п╣п╢п╬п╡п╟я┌п╣п╩я▄п╫п╬, я│п╟п╪п╟я▐ п©п╬я│п╩п╣п╢п╫я▐я▐ п╡п╣я─я│п╦я▐ я█я┌п╬пЁп╬ я└п╟п╧п╩п╟ п╠я▀п╩п╟ п╡ п©я─п╟п╡п╨п╣, п©я─п╣п╢я┬п╣я│я┌п╡я┐я▌я┴п╣п╧ я┐п╢п╟п╩п╣п╫п╦я▌. п▓я▀п╡п╬п╢: п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬ п╦п╥ п©я─п╟п╡п╨п╦ 807 п╡п╬я│я│я┌п╟п╫п╬п╡п╦я┌я▄ п©я┐я┌я▄ /calc/trunk/real.c.

п÷п╬п╦я│п╨ Б─■ п╫п╣п©я─п╬я│я┌п╟я▐ п╥п╟п╢п╟я┤п╟. п╒п╣п©п╣я─я▄, п╨п╬пЁп╢п╟ п╫п╟п╪ п╦п╥п╡п╣я│я┌п╫п╬, я┤я┌п╬ п╦п╪п╣п╫п╫п╬ п╫я┐п╤п╫п╬ п╡п╬я│я│я┌п╟п╫п╬п╡п╦я┌я▄, п╣я│я┌я▄ п╢п╡п╣ п╡п╟я─п╦п╟п╫я┌п╟ п╢п╣п╧я│я┌п╡п╦п╧.

п▓п╬-п©п╣я─п╡я▀я┘, п╪я▀ п╪п╬п╤п╣п╪ п©п╬я│я─п╣п╢я│я┌п╡п╬п╪ svn merge п©я─п╦п╪п╣п╫п╦я┌я▄ п©я─п╟п╡п╨я┐ 808 б╚п╡ п╬п╠я─п╟я┌п╫п╬п╪ п╫п╟п©я─п╟п╡п╩п╣п╫п╦п╦б╩. (п п╟п╨ п╬я┌п╪п╣п╫я▐я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╪я▀ я┐п╤п╣ я─п╟я│я│п╪п╟я┌я─п╦п╡п╟п╩п╦, я│п╪. б╚п·я┌п╪п╣п╫п╟ п╦п╥п╪п╣п╫п╣п╫п╦п╧б╩.) п╜я┌п╬ п©я─п╦п╡п╣п╢п╣я┌ п╨ п©п╬п╡я┌п╬я─п╫п╬п╪я┐ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▌ я└п╟п╧п╩п╟ real.c п╡ я└п╬я─п╪п╣ п╩п╬п╨п╟п╩я▄п╫п╬пЁп╬ п╦п╥п╪п╣п╫п╣п╫п╦я▐. п╓п╟п╧п╩ п╠я┐п╢п╣я┌ п╥п╟п©п╩п╟п╫п╦я─п╬п╡п╟п╫ п╢п╩я▐ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▐, п╦ п©п╬я│п╩п╣ я└п╦п╨я│п╟я├п╦п╦ п╠я┐п╢п╣я┌ я│п╫п╬п╡п╟ п©я─п╦я│я┐я┌я│я┌п╡п╬п╡п╟я┌я▄ п╡ HEAD.

п·п╢п╫п╟п╨п╬, п╡ п╢п╟п╫п╫п╬п╪ п©я─п╦п╪п╣я─п╣ я█я┌п╬ п╫п╣ я│п╟п╪п╬п╣ п╩я┐я┤я┬п╣п╣ я─п╣я┬п╣п╫п╦п╣. п÷п╬п╡я┌п╬я─п╫п╬п╣ п©я─п╦п╪п╣п╫п╣п╫п╦п╣ п©я─п╟п╡п╨п╦ 808 п╫п╣ я┌п╬п╩я▄п╨п╬ п╢п╬п╠п╟п╡п╦я┌ я└п╟п╧п╩ real.c. п⌡п╬пЁ-я│п╬п╬п╠я┴п╣п╫п╦п╣ п©п╬п╨п╟п╥я▀п╡п╟п╣я┌, я┤я┌п╬ я┌п╟п╨п╤п╣ п╠я┐п╢я┐я┌ п╬я┌п╪п╣п╫п╣п╫я▀ п╫п╣п╨п╬я┌п╬я─я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ integer.c, я┤я┌п╬ п╡п╣я│я▄п╪п╟ п╫п╣п╤п╣п╩п╟я┌п╣п╩я▄п╫п╬. п п╬п╫п╣я┤п╫п╬, п╪п╬п╤п╫п╬ п╡я▀п©п╬п╩п╫п╦я┌я▄ п╬п╠я─п╟я┌п╫п╬п╣ я│п╩п╦я▐п╫п╦п╣ я│ п©я─п╟п╡п╨п╬п╧ 808, п╟ п╥п╟я┌п╣п╪ п╬я┌п╪п╣п╫п╦я┌я▄ (svn revert) п╩п╬п╨п╟п╩я▄п╫я▀п╣ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ integer.c, п╫п╬ я┌п╟п╨п╬п╧ п©п╬п╢я┘п╬п╢ п©п╩п╬я┘п╬ п╪п╟я│я┬я┌п╟п╠п╦я─я┐п╣я┌я│я▐. п╖я┌п╬, п╣я│п╩п╦ п╡ п©я─п╟п╡п╨п╣ 808 п╦п╥п╪п╣п╫п╦п╩п╬я│я▄ 90 я└п╟п╧п╩п╬п╡?

п÷я─п╦ п╢я─я┐пЁп╬п╪, п╠п╬п╩п╣п╣ п╟п╨п╨я┐я─п╟я┌п╫п╬п╪ п©п╬п╢я┘п╬п╢п╣ svn merge п╡п╬п╬п╠я┴п╣ п╫п╣ п╦я│п©п╬п╩я▄п╥я┐п╣я┌я│я▐, п╟ п╡п╪п╣я│я┌п╬ я█я┌п╬пЁп╬ п©я─п╦п╪п╣п╫я▐п╣я┌я│я▐ п╨п╬п╪п╟п╫п╢п╟ svn copy. п÷я─п╬я│я┌п╬ я│п╨п╬п©п╦я─я┐п╧я┌п╣ п╬п╠я┼п╣п╨я┌, п╥п╟п╢п╟п╫п╫я▀п╧ б╚п©п╟я─п╬п╧ п╨п╬п╬я─п╢п╦п╫п╟я┌б╩ (п©я─п╟п╡п╨п╟ п╦ п©я┐я┌я▄), п╦п╥ я┘я─п╟п╫п╦п╩п╦я┴п╟ п╡ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌:

$ svn copy --revision 807 \
           http://svn.example.com/repos/calc/trunk/real.c ./real.c

$ svn status
A  +   real.c

$ svn commit -m "Resurrected real.c from revision 807, /calc/trunk/real.c."
Adding         real.c
Transmitting file data .
Committed revision 1390.

п≈п╫п╟п╨ "п©п╩я▌я│" п╡ я│я┌п╬п╩п╠я├п╣ я│я┌п╟я┌я┐я│п╟ п©п╬п╨п╟п╥я▀п╡п╟п╣я┌, я┤я┌п╬ я█п╩п╣п╪п╣п╫я┌ п╫п╣ п©я─п╬я│я┌п╬ п╥п╟п©п╩п╟п╫п╦я─п╬п╡п╟п╫ п╢п╩я▐ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▐, п╟ п╥п╟п©п╩п╟п╫п╦я─п╬п╡п╟п╫ п╢п╩я▐ п╢п╬п╠п╟п╡п╩п╣п╫п╦я▐ б╚я│ п╦я│я┌п╬я─п╦п╣п╧б╩. Subversion п╥п╟п©п╬п╪п╦п╫п╟п╣я┌, п╬я┌п╨я┐п╢п╟ п╬п╫ п╠я▀п╩ я│п╨п╬п©п╦я─п╬п╡п╟п╫. п▓ п╠я┐п╢я┐я┴п╣п╪ п╡я▀п╥п╬п╡ svn log п╢п╩я▐ я█я┌п╬пЁп╬ я└п╟п╧п╩п╟ п╠я┐п╢п╣я┌ п©п╣я─п╣я│п╣п╨п╟я┌я▄ я┌п╬я┤п╨я┐ п╡п╬я│я│я┌п╟п╫п╬п╡п╩п╣п╫п╦я▐ я└п╟п╧п╩п╟ п╦ п©я─п╬я│п╩п╣п╤п╦п╡п╟я┌я▄ п╡я│я▌ п╦я│я┌п╬я─п╦я▌, п©я─п╣п╢я┬п╣я│я┌п╡я┐я▌я┴я┐я▌ п©я─п╟п╡п╨п╣ 807. п■я─я┐пЁп╦п╪п╦ я│п╩п╬п╡п╟п╪п╦, п╫п╬п╡я▀п╧ я└п╟п╧п╩ real.c п╫п╟ я│п╟п╪п╬п╪ п╢п╣п╩п╣ п╫п╣ я▐п╡п╩я▐п╣я┌я│я▐ п╫п╬п╡я▀п╪; п╬п╫ я▐п╡п╩я▐п╣я┌я│я▐ п©я─я▐п╪я▀п╪ п©п╬я┌п╬п╪п╨п╬п╪ п╦я│я┘п╬п╢п╫п╬пЁп╬ я└п╟п╧п╩п╟, п╨п╬я┌п╬я─я▀п╧ п╠я▀п╩ я┐п╢п╟п╩п╣п╫.

п╔п╬я┌я▐ п╫п╟я┬ п©я─п╦п╪п╣я─ п╢п╣п╪п╬п╫я│я┌я─п╦я─я┐п╣я┌ я┌п╬п╩я▄п╨п╬ п╡п╬я│я│я┌п╟п╫п╬п╡п╩п╣п╫п╦п╣ я└п╟п╧п╩п╟, п╬я┌п╪п╣я┌п╦п╪, я┤я┌п╬ я┌п╟п╨п╬п╧ п╤п╣ п©п╬п╢я┘п╬п╢ п╠я┐п╢п╣я┌ я─п╟п╠п╬я┌п╟я┌я▄ п╦ п©я─п╦ п╡п╬я│я│я┌п╟п╫п╬п╡п╩п╣п╫п╦п╦ я┐п╢п╟п╩п╣п╫п╫я▀я┘ п╨п╟я┌п╟п╩п╬пЁп╬п╡.

пёп©я─п╟п╡п╩п╣п╫п╦п╣ п╡п╣я─я│п╦я▐п╪п╦ я┤п╟я┴п╣ п╡я│п╣пЁп╬ п╦я│п©п╬п╩я▄п╥я┐п╣я┌я│я▐ п©я─п╦ я─п╟п╥я─п╟п╠п╬я┌п╨п╣ п©я─п╬пЁя─п╟п╪п╪п╫п╬пЁп╬ п╬п╠п╣я│п©п╣я┤п╣п╫п╦я▐, п©п╬я█я┌п╬п╪я┐ п╥п╢п╣я│я▄ п╪я▀ п╡п╨я─п╟я┌я├п╣ я─п╟я│я│п╪п╬я┌я─п╦п╪ п╢п╡п╟ п╫п╟п╦п╠п╬п╩п╣п╣ я┤п╟я│я┌п╬ п╦я│п©п╬п╩я▄п╥я┐п╣п╪я▀я┘ п╨п╬п╪п╟п╫п╢п╟п╪п╦ п©я─п╬пЁя─п╟п╪п╪п╦я│я┌п╬п╡ п©я─п╦п╣п╪п╟ п╡п╣я┌п╡п╩п╣п╫п╦я▐/я│п╩п╦я▐п╫п╦я▐. п∙я│п╩п╦ п╡я▀ п╫п╣ п╦я│п©п╬п╩я▄п╥я┐п╣я┌п╣ Subversion п╢п╩я▐ я─п╟п╥я─п╟п╠п╬я┌п╨п╦ п©я─п╬пЁя─п╟п╪п╪п╫п╬пЁп╬ п╬п╠п╣я│п©п╣я┤п╣п╫п╦я▐, п╪п╬п╤п╣я┌п╣ п©я─п╬п©я┐я│я┌п╦я┌я▄ я█я┌п╬я┌ я─п╟п╥п╢п╣п╩. п∙я│п╩п╦ п╡я▀ Б─■ я─п╟п╥я─п╟п╠п╬я┌я┤п╦п╨ п©я─п╬пЁя─п╟п╪п╪п╫п╬пЁп╬ п╬п╠п╣я│п©п╣я┤п╣п╫п╦я▐, п╡п©п╣я─п╡я▀п╣ п╦я│п©п╬п╩я▄п╥я┐я▌я┴п╦п╧ п╨п╬п╫я┌я─п╬п╩я▄ п╡п╣я─я│п╦п╧, я┐п╢п╣п╩п╦я┌п╣ я█я┌п╬п╪я┐ я─п╟п╥п╢п╣п╩я┐ п©я─п╦я│я┌п╟п╩я▄п╫п╬п╣ п╡п╫п╦п╪п╟п╫п╦п╣, п©п╬я│п╨п╬п╩я▄п╨я┐ п╬п©я▀я┌п╫я▀п╣ я─п╟п╥я─п╟п╠п╬я┌я┤п╦п╨п╦ я│я┤п╦я┌п╟я▌я┌ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦п╣ п╢п╟п╫п╫я▀я┘ п©я─п╦п╣п╪п╬п╡ я┘п╬я─п╬я┬п╦п╪ я│я┌п╦п╩п╣п╪. п╒п╟п╨п╦п╣ п©я─п╦п╣п╪я▀ п╫п╣ я▐п╡п╩я▐я▌я┌я│я▐ я│п©п╣я├п╦я└п╦я┤п╫я▀п╪п╦ п╢п╩я▐ Subversion; п╬п╫п╦ п©я─п╦п╪п╣п╫п╦п╪я▀ п╨ п╩я▌п╠п╬п╧ я│п╦я│я┌п╣п╪п╣ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╡п╣я─я│п╦я▐п╪п╦. п·п╢п╫п╟п╨п╬, п╥п╢п╣я│я▄ п╪я▀ п╡п╥пЁп╩я▐п╫п╣п╪ п╫п╟ п╫п╦я┘ я│ п©п╬п╥п╦я├п╦п╧ Subversion.

$ cd trunk-working-copy

$ svn update
At revision 1910.

$ svn merge http://svn.example.com/repos/calc/trunk@1910 \
            http://svn.example.com/repos/calc/branches/mybranch@1910
U  real.c
U  integer.c
A  newdirectory
A  newdirectory/newfile
Б─╕

п≤ я│п╫п╬п╡п╟ п©я─п╦я┘п╬п╢п╦я┌ п╫п╟ п©п╬п╪п╬я┴я▄ svn copy. п∙я│п╩п╦ п╡п╟п╪ п╫я┐п╤п╫п╬ я│п╢п╣п╩п╟я┌я▄ я│п╫п╦п╪п╬п╨ /calc/trunk п╡ я┌п╬я┤п╫п╬ я┌п╟п╨п╬п╪ п╡п╦п╢п╣ п╨п╟п╨ п╡ п©я─п╟п╡п╨п╣ HEAD, я│п╢п╣п╩п╟п╧я┌п╣ п╨п╬п©п╦я▌ я█я┌п╬п╧ п╢п╦я─п╣п╨я┌п╬я─п╦п╦:

$ svn copy http://svn.example.com/repos/calc/trunk \
           http://svn.example.com/repos/calc/tags/release-1.0 \
      -m "Tagging the 1.0 release of the 'calc' project."

Committed revision 351.

п▓ я█я┌п╬п╪ п©я─п╦п╪п╣я─п╣ п©я─п╣п╢п©п╬п╩п╟пЁп╟п╣я┌я│я▐, я┤я┌п╬ п╢п╦я─п╣п╨я┌п╬я─п╦я▐ /calc/tags я│я┐я┴п╣я│я┌п╡я┐п╣я┌. (п∙я│п╩п╦ п╫п╣я┌, п╬п╠я─п╟я┌п╦я┌п╣я│я▄ п╨ svn mkdir). п÷п╬я│п╩п╣ я┌п╬пЁп╬ п╨п╟п╨ я│п╢п╣п╩п╟п╫п╟ п╨п╬п©п╦я▐, п╫п╬п╡п╟я▐ п╢п╦я─п╣п╨я┌п╬я─п╦я▐ release-1.0 п╫п╟п╡я│п╣пЁп╢п╟ я│п╬я┘я─п╟п╫п╦я┌ я│п╬я│я┌п╬я▐п╫п╦п╣ п©я─п╬п╣п╨я┌п╟ п╡ я┌п╟п╨п╬п╪ п╡п╦п╢п╣ п╡ п╨п╟п╨п╬п╪ п╬п╫ я│я┐я┴п╣я│я┌п╡п╬п╡п╟п╩ п╡ п©я─п╟п╡п╨п╣ HEAD п╫п╟ п╪п╬п╪п╣п╫я┌ я│п╬п╥п╢п╟п╫п╦я▐ п╨п╬п©п╦п╦. п п╬п╫п╣я┤п╫п╬, п╪п╬п╤п╫п╬ п╠п╬п╩п╣п╣ я┌п╬я┤п╫п╬ я┐п╨п╟п╥п╟я┌я▄ п╨п╟п╨я┐я▌ п╦п╪п╣п╫п╫п╬ п©я─п╟п╡п╨я┐ п╨п╬п©п╦я─п╬п╡п╟я┌я▄, п╡п╬п╥п╪п╬п╤п╫п╟ я│п╦я┌я┐п╟я├п╦я▐, п╨п╬пЁп╢п╟ п╨я┌п╬-я┌п╬ п╢я─я┐пЁп╬п╧ п╥п╟я└п╦п╨я│п╦я─п╬п╡п╟п╩ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ п©я─п╬п╣п╨я┌п╣ я│ п╨п╬я┌п╬я─я▀п╪п╦ п╡я▀ п╣я┴п╣ п╫п╣ я┐я│п©п╣п╩п╦ п©п╬п╥п╫п╟п╨п╬п╪п╦я┌я▄я│я▐. п÷п╬я█я┌п╬п╪я┐, п╣я│п╩п╦ п╡я▀ п╥п╫п╟п╣я┌п╣, я┤я┌п╬ п©я─п╟п╡п╨п╟ 350 /calc/trunk я█я┌п╬ п╦п╪п╣п╫п╫п╬ я┌п╬я┌ я│п╫п╦п╪п╬п╨ п╨п╬я┌п╬я─я▀п╧ п╡п╟п╪ п╫я┐п╤п╣п╫, п╪п╬п╤п╣я┌п╣ я┐п╨п╟п╥п╟я┌я▄ п╣п╣ п©п╣я─п╣п╢п╟п╡ -r 350 п╨п╬п╪п╟п╫п╢п╣ svn copy.

п÷п╬я│я┌п╬п╧я┌п╣: п╡п╣п╢я▄ п©я─п╬я├п╣п╢я┐я─п╟ я│п╬п╥п╢п╟п╫п╦я▐ п╪п╣я┌п╨п╦ я┌п╟п╨п╟я▐ п╤п╣ п╨п╟п╨ п©я─п╬я├п╣п╢я┐я─п╟ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╫п╟я▐ п╫п╟п╪п╦ п©я─п╦ я│п╬п╥п╢п╟п╫п╦п╦ п╡п╣я┌п╨п╦? п■п╟, я└п╟п╨я┌п╦я┤п╣я│п╨п╦, я█я┌п╬ я┌п╟п╨. Subversion п╫п╣ я─п╟п╥п╢п╣п╩я▐п╣я┌ п╡п╣я┌п╨п╦ п╦ п╪п╣я┌п╨п╦. п≤ я┌п╬ п╦ п╢я─я┐пЁп╬п╣ я▐п╡п╩я▐п╣я┌я│я▐ п╬п╠я▀я┤п╫я▀п╪п╦ п╢п╦я─п╣п╨я┌п╬я─п╦я▐п╪п╦, я│п╬п╥п╢п╟п╫п╫я▀п╪п╦ п╨п╬п©п╦я─п╬п╡п╟п╫п╦п╣п╪. п п╟п╨ п╦ п╡ я│п╩я┐я┤п╟п╣ я│ п╡п╣я┌п╨п╟п╪п╦, я│п╨п╬п©п╦я─п╬п╡п╟п╫п╫п╟я▐ п╢п╦я─п╣п╨я┌п╬я─п╦я▐ я│я┌п╟п╫п╬п╡п╦я┌я▄я│я▐ б╚п╪п╣я┌п╨п╬п╧б╩ я┌п╬п╩я▄п╨п╬ п©п╬я┌п╬п╪я┐, я┤я┌п╬ я┤п╣п╩п╬п╡п╣п╨ я│я┤п╦я┌п╟п╣я┌ п╣п╣ я┌п╟п╨п╬п╡п╬п╧: п╣я│п╩п╦ п╫п╦п╨я┌п╬ п╫п╣ п╢п╣п╩п╟п╣я┌ я└п╦п╨я│п╟я├п╦п╧ п╡ я█я┌я┐ п╢п╦я─п╣п╨я┌п╬я─п╦я▌ п╬п╫п╟ п╠я┐п╢п╣я┌ п╬я│я┌п╟п╡п╟я┌я▄я│я▐ я│п╫п╦п╪п╨п╬п╪. п∙я│п╩п╦ п╡ я█я┌я┐ п╢п╦я─п╣п╨я┌п╬я─п╦я▌ п╫п╟я┤п╫я┐я┌ п╢п╣п╩п╟я┌я▄ я└п╦п╨я│п╟я├п╦п╦ п╬п╫п╟ п©я─п╣п╡я─п╟я┌п╦я┌я│я▐ п╡ п╡п╣я┌п╨я┐.

п∙я│п╩п╦ п╡я▀ п╟п╢п╪п╦п╫п╦я│я┌я─п╦я─я┐п╣я┌п╣ я┘я─п╟п╫п╦п╩п╦я┴п╣, п╣я│я┌я▄ п╢п╡п╟ п╡п╬п╥п╪п╬п╤п╫я▀я┘ п©п╬п╢я┘п╬п╢п╟ я┐п©я─п╟п╡п╩п╣п╫п╦я▐ п╪п╣я┌п╨п╟п╪п╦. п÷п╣я─п╡я▀п╧ п©п╬п╢я┘п╬п╢ б╚я─я┐я┤п╫п╬п╧б╩: п╡ я│п╬п╬я┌п╡п╣я┌я│я┌п╡п╦п╦ я│ п©я─п╟п╡п╦п╩п╟п╪п╦ п©я─п╬п╣п╨я┌п╟ я─п╣я┬п╦я┌п╣, пЁп╢п╣ п╠я┐п╢я┐я┌ п╫п╟я┘п╬п╢п╦я┌я▄я│я▐ п╪п╣я┌п╨п╦ п╦ я┐п╠п╣п╢п╦я┌п╣я│я▄ п╡ я┌п╬п╪, я┤я┌п╬ п╡я│п╣ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╦ п╥п╫п╟я▌я┌ п╨п╟п╨ я─п╟я│я│п╪п╟я┌я─п╦п╡п╟я┌я▄ п╢п╦я─п╣п╨я┌п╬я─п╦п╦ я│п╨п╬п©п╦я─п╬п╡п╟п╫п╫я▀п╣ я│я▌п╢п╟. (п╒п╬ п╣я│я┌я▄ я┐п╠п╣п╢п╦я┌п╣я│я▄, я┤я┌п╬ п╬п╫п╦ п╥п╫п╟я▌я┌ п╬ я┌п╬п╪ я┤я┌п╬ п╡ п╫п╦я┘ п╫п╣п╩я▄п╥я▐ п╡я▀п©п╬п╩п╫я▐я┌я▄ я└п╦п╨я│п╟я├п╦п╦.) п▓я┌п╬я─п╬п╧ п©п╬п╢я┘п╬п╢ п╠п╬п╩п╣п╣ п©п╟я─п╟п╫п╬п╦п╢п╟п╩я▄п╫я▀п╧: п╡я▀ п╪п╬п╤п╣я┌п╣ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ п╬п╢п╫п╦п╪ п╦п╥ я│п╨я─п╦п©я┌п╬п╡ п╢п╩я▐ п╨п╬п╫я┌я─п╬п╩я▐ п╢п╬я│я┌я┐п©п╟, п©п╬я│я┌п╟п╡п╩я▐п╣п╪я▀п╪ я│ Subversion п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬ п╠я▀ п╫п╦п╨я┌п╬ п╫п╦я┤п╣пЁп╬ п╢я─я┐пЁп╬пЁп╬ п╨я─п╬п╪п╣ я│п╬п╥п╢п╟п╫п╦я▐ п╨п╬п©п╦п╧ п╡ п╬п╠п╩п╟я│я┌п╦ п╢п╩я▐ я│п╬п╥п╢п╟п╫п╦я▐ п╪п╣я┌п╬п╨ я│п╢п╣п╩п╟я┌я▄ п╫п╣ п╪п╬пЁ. (п║п╪. п⌠п╩п╟п╡п╟б═6, п²п╟я│я┌я─п╬п╧п╨п╟ я│п╣я─п╡п╣я─п╟.) п·п╢п╫п╟п╨п╬ п╬п╠я▀я┤п╫п╬ п╡ п©п╟я─п╟п╫п╬п╦п╢п╟п╩я▄п╫п╬п╪ п©п╬п╢я┘п╬п╢п╣ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬я│я┌п╦ п╫п╣я┌. п∙я│п╩п╦ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄ п╫п╣п©я─п╣п╢п╫п╟п╪п╣я─п╣п╫п╫п╬ п╥п╟я└п╦п╨я│п╦я─я┐п╣я┌ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ п╢п╦я─п╣п╨я┌п╬я─п╦я▌ я│ п╪п╣я┌п╨п╬п╧, п╡я▀ п╪п╬п╤п╣я┌п╣ п©я─п╬я│я┌п╬ п╬я┌п╪п╣п╫п╦я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐, п╨п╟п╨ я█я┌п╬ п╠я▀п╩п╬ я─п╟я│я│п╪п╬я┌я─п╣п╫п╬ п╡ п©я─п╣п╢я▀п╢я┐я┴п╣п╪ я─п╟п╥п╢п╣п╩п╣. п п╟п╨ п╫п╦ п╨п╟п╨, я█я┌п╬ я┐п©я─п╟п╡п╩п╣п╫п╦п╣ п╡п╣я─я│п╦я▐п╪п╦.

п≤п╫п╬пЁп╢п╟ п╡п╟п╪ п╠я┐п╢п╣я┌ п╫п╣п╬п╠я┘п╬п╢п╦п╪ п╠п╬п╩п╣п╣ я│п╩п╬п╤п╫я▀п╧ б╚я│п╫п╦п╪п╬п╨б╩, я┤п╣п╪ п╬п╢п╫п╟ п╣п╢п╦п╫я│я┌п╡п╣п╫п╫п╟я▐ п╢п╦я─п╣п╨я┌п╬я─п╦я▐ п╡ п╬п╢п╫п╬п╧ п©я─п╟п╡п╨п╣.

п²п╟п©я─п╦п╪п╣я─, п©я─п╣п╢я│я┌п╟п╡п╦п╪, я┤я┌п╬ п╡п╟я┬ п©я─п╬п╣п╨я┌ пЁп╬я─п╟п╥п╢п╬ п╠п╬п╩я▄я┬п╣, я┤п╣п╪ п╫п╟я┬ п©я─п╦п╪п╣я─ calc: п╢п╬п©я┐я│я┌п╦п╪ п╬п╫ я│п╬п╢п╣я─п╤п╦я┌ п╫п╣я│п╨п╬п╩я▄п╨п╬ п©п╬п╢п╢п╦я─п╣п╨я┌п╬я─п╦п╧ п╦ п╫п╟п╪п╫п╬пЁп╬ п╠п╬п╩я▄я┬п╣ я└п╟п╧п╩п╬п╡. п▓ п©я─п╬я├п╣я│я│п╣ я─п╟п╠п╬я┌я▀ п╡п╟п╪ п╪п╬п╤п╣я┌ п©п╬п╫п╟п╢п╬п╠п╦я┌я▄я│я▐ я│п╬п╥п╢п╟я┌я▄ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, я│п╬п╢п╣я─п╤п╟я┴я┐я▌ п╨п╬п╫п╨я─п╣я┌п╫я┐я▌ я└я┐п╫п╨я├п╦п╬п╫п╟п╩я▄п╫п╬я│я┌я▄ п╦ п╦я│п©я─п╟п╡п╩п╣п╫п╫я▀п╣ п╬я┬п╦п╠п╨п╦. п■п╬п╠п╦я┌я▄я│я▐ я█я┌п╬пЁп╬ п╡я▀ п╪п╬п╤п╣я┌п╣ п╡я▀п╠п╬я─п╬я┤п╫п╬ п╡п╬п╥п╡я─п╟я┴п╟я▐ я└п╟п╧п╩я▀ п╦п╩п╦ п╢п╦я─п╣п╨я┌п╬я─п╦п╦ п╨ п╨п╬п╫п╨я─п╣я┌п╫п╬п╧ п©я─п╟п╡п╨п╣ (п╦я│п©п╬п╩я▄п╥я┐я▐ svn update -r п©п╬ п╪п╣я─п╣ п╫п╣п╬п╠я┘п╬п╢п╦п╪п╬я│я┌п╦) п╦п╩п╦ п©п╣я─п╣п╨п╩я▌я┤п╟я▐ я└п╟п╧п╩я▀ п╦п╩п╦ п╢п╦я─п╣п╨я┌п╬я─п╦п╦ п╫п╟ п╬я┌п╢п╣п╩я▄п╫я▀п╣ п╡п╣я┌п╨п╦ (п©я─п╦п╪п╣п╫я▐я▐ svn switch). п÷п╬ п╥п╟п╡п╣я─я┬п╣п╫п╦п╦ я─п╟п╠п╬я┤п╟я▐я▐ п╨п╬п©п╦я▐ п╠я┐п╢п╣я┌ п©я─п╣п╢я│я┌п╟п╡п╩я▐я┌я▄ я│п╬п╠п╬п╧ п╪п╣я┬п╟п╫п╦п╫я┐ я─п╟п╥п╩п╦я┤п╫я▀я┘ п╢п╦я─п╣п╨я┌п╬я─п╦п╧ п╦ п©я─п╟п╡п╬п╨ я┘я─п╟п╫п╦п╩п╦я┴п╟. п÷п╬я│п╩п╣ п©я─п╬п╡п╣я─п╨п╦ п╡я▀ п©п╬п╧п╪п╣я┌п╣, я┤я┌п╬ п╡п╟п╪ п╫я┐п╤п╫п╟ п╦п╪п╣п╫п╫п╬ я┌п╟п╨п╟я▐ п╨п╬п╪п╠п╦п╫п╟я├п╦я▐.

п▓я─п╣п╪я▐ я│п╬п╥п╢п╟п╡п╟я┌я▄ я│п╫п╦п╪п╬п╨. п п╬п©п╦я─п╬п╡п╟п╫п╦п╣ п╬п╢п╫п╬пЁп╬ URL п╡ п╢я─я┐пЁп╬п╧ п╥п╢п╣я│я▄ п╫п╣ п©я─п╬п╧п╢п╣я┌. п≈п╢п╣я│я▄ п╫я┐п╤п╫п╬ я│п╢п╣п╩п╟я┌я▄ п╦ я│п╬я┘я─п╟п╫п╦я┌я▄ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ я│п╫п╦п╪п╬п╨ п╦п╪п╣п╫п╫п╬ я┌п╟п╨п╬п╧ я│я┌я─я┐п╨я┌я┐я─я▀ п╨п╬я┌п╬я─я┐я▌ п╦п╪п╣п╣я┌ я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐. п  я│я┤п╟я│я┌я▄я▌, svn copy п╦п╪п╣п╣я┌ я┤п╣я┌я▀я─п╣ я│п©п╬я│п╬п╠п╟ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦я▐ (п╬ п╨п╬я┌п╬я─я▀я┘ п╡я▀ п╪п╬п╤п╣я┌п╣ п©я─п╬я┤п╦я┌п╟я┌я▄ п╡ п⌠п╩п╟п╡п╟б═9, п÷п╬п╩п╫п╬п╣ я│п©я─п╟п╡п╬я┤п╫п╬п╣ я─я┐п╨п╬п╡п╬п╢я│я┌п╡п╬ п©п╬ Subversion), п╡п╨п╩я▌я┤п╟я▐ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌я▄ п╨п╬п©п╦я─п╬п╡п╟я┌я▄ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ п╢п╣я─п╣п╡п╬ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦:

$ ls
my-working-copy/

$ svn copy my-working-copy http://svn.example.com/repos/calc/tags/mytag

Committed revision 352.

п╒п╣п©п╣я─я▄ п╡ я┘я─п╟п╫п╦п╩п╦я┴п╣ п╣я│я┌я▄ п╫п╬п╡п╟я▐ п╢п╦я─п╣п╨я┌п╬я─п╦я▐ /calc/tags/mytag п╨п╬я┌п╬я─п╟я▐ я▐п╡п╩я▐п╣я┌я│я▐ п©п╬п╩п╫я▀п╪ п╬я┌я─п╟п╤п╣п╫п╦п╣п╪ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ Б─■ я│п╪п╣я┬п╟п╫п╫я▀п╣ п©я─п╟п╡п╨п╦, URL, п╦ я┌п╬п╪я┐ п©п╬п╢п╬п╠п╫п╬п╣.

п²п╣п╨п╬я┌п╬я─я▀п╣ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╦ п╫п╟я┘п╬п╢я▐я┌ п╦п╫я┌п╣я─п╣я│п╫п╬п╣ п©я─п╦п╪п╣п╫п╣п╫п╦п╣ я█я┌п╬п╧ п╡п╬п╥п╪п╬п╤п╫п╬я│я┌п╦. п≤п╫п╬пЁп╢п╟ п╡п╬п╥п╫п╦п╨п╟я▌я┌ я│п╦я┌я┐п╟я├п╦п╦, п╨п╬пЁп╢п╟ п╡ п╡п╟я┬п╣п╧ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ я│п╬п╢п╣я─п╤п╦я┌я│я▐ п╫п╣п╨п╬я┌п╬я─я▀п╧ п╫п╟п╠п╬я─ п╩п╬п╨п╟п╩я▄п╫я▀я┘ п╦п╥п╪п╣п╫п╣п╫п╦п╧, п╨п╬я┌п╬я─я▀п╣ п╡я▀ я┘п╬я┌п╣п╩п╦ п╠я▀ п©п╬п╨п╟п╥п╟я┌я▄ я│п╬я─п╟п╥я─п╟п╠п╬я┌я┤п╦п╨я┐. п▓п╪п╣я│я┌п╬ п╥п╟п©я┐я│п╨п╟ svn diff п╦ п╬я┌п©я─п╟п╡п╨п╦ п©п╟я┌я┤-я└п╟п╧п╩п╟ (п╨п╬я┌п╬я─я▀п╧ п╫п╣ я│п╪п╬п╤п╣я┌ п╬я┌я─п╟п╥п╦я┌я▄ п╦п╥п╪п╣п╫п╣п╫п╦я▐ п╡ я│я┌я─я┐п╨я┌я┐я─п╣ я└п╟п╧п╩п╬п╡, п╦п╥п╪п╣п╫п╣п╫п╫я▀п╣ я│п╦п╪п╡п╬п╩я▄п╫я▀п╣ я│я│я▀п╩п╨п╦ п╦п╩п╦ я│п╡п╬п╧я│я┌п╡п╟), п╪п╬п╤п╫п╬ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ svn copy п╢п╩я▐ б╚п╥п╟пЁя─я┐п╥п╨п╦б╩ я─п╟п╠п╬я┤п╣п╧ п╨п╬п©п╦п╦ п╡ п╬я┌п╢п╣п╩я▄п╫я┐я▌ п╬п╠п╩п╟я│я┌я▄ я┘я─п╟п╫п╦п╩п╦я┴п╟. п÷п╬я│п╩п╣ я┤п╣пЁп╬ п╡п╟я┬ я│п╬я─п╟п╥я─п╟п╠п╬я┌я┤п╦п╨ я│п╪п╬п╤п╣я┌ п╩п╦п╠п╬ п╡п╬я│я│п╬п╥п╢п╟я┌я▄ я┐ я│п╣п╠я▐ п╡п╟я┬я┐ я─п╟п╠п╬я┤я┐я▌ п╨п╬п©п╦я▌, п╩п╦п╠п╬, п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟п╡я┬п╦я│я▄ svn merge, п©п╬п╩я┐я┤п╦я┌я▄ я┌п╬п╩я▄п╨п╬ п╡п╫п╣я│п╣п╫п╫я▀п╣ п╡п╟п╪п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐.

п║я┐я┴п╣я│я┌п╡я┐п╣я┌ п╫п╣я│п╨п╬п╩я▄п╨п╬ я│я┌п╟п╫п╢п╟я─я┌п╫я▀я┘, я─п╣п╨п╬п╪п╣п╫п╢я┐п╣п╪я▀я┘ я│п©п╬я│п╬п╠п╬п╡ п╬я─пЁп╟п╫п╦п╥п╟я├п╦п╦ я┘я─п╟п╫п╦п╩п╦я┴п╟. п п╟п╨ п©я─п╟п╡п╦п╩п╬, я│п╬п╥п╢п╟п╣я┌я│я▐ п╢п╦я─п╣п╨я┌п╬я─п╦я▐ trunk, п╡ п╨п╬я┌п╬я─п╬п╧ п╫п╟я┘п╬п╢п╦я┌я│я▐ б╚пЁп╩п╟п╡п╫п╟я▐ п╩п╦п╫п╦я▐б╩ я─п╟п╥я─п╟п╠п╬я┌п╨п╦, п╢п╦я─п╣п╨я┌п╬я─п╦я▐ branches п╢п╩я▐ я┘я─п╟п╫п╣п╫п╦я▐ п╡п╣я┌п╬п╨ п╦ п╢п╦я─п╣п╨я┌п╬я─п╦я▐ tags п╢п╩я▐ я┘я─п╟п╫п╣п╫п╦я▐ п╪п╣я┌п╬п╨. п∙я│п╩п╦ я┘я─п╟п╫п╦п╩п╦я┴п╣ я│п╬п╢п╣я─п╤п╦я┌ я┌п╬п╩я▄п╨п╬ п╬п╢п╦п╫ п©я─п╬п╣п╨я┌, п╬п╠я▀я┤п╫п╬ я│п╬п╥п╢п╟я▌я┌ я┌я─п╦ п╢п╦я─п╣п╨я┌п╬я─п╦п╦ п╡п╣я─я┘п╫п╣пЁп╬ я┐я─п╬п╡п╫я▐:

/trunk
/branches
/tags

п∙я│п╩п╦ я┘я─п╟п╫п╦п╩п╦я┴п╣ я│п╬п╢п╣я─п╤п╦я┌ п╫п╣я│п╨п╬п╩я▄п╨п╬ п©я─п╬п╣п╨я┌п╬п╡, п╟п╢п╪п╦п╫п╦я│я┌я─п╟я┌п╬я─, п╬п╠я▀я┤п╫п╬ я│п╬п╥п╢п╟п╣я┌ я┌п╟п╨я┐я▌ я│я┌я─я┐п╨я┌я┐я─я┐ п╢п╩я▐ п╨п╟п╤п╢п╬пЁп╬ п©я─п╬п╣п╨я┌п╟ п╬я┌п╢п╣п╩я▄п╫п╬ (п╥п╟ п╠п╬п╩п╣п╣ п©п╬п╢я─п╬п╠п╫п╬п╧ п╦п╫я└п╬я─п╪п╟я├п╦п╣п╧ п╬ б╚п╨п╬я─п╫п╣ п©я─п╬п╣п╨я┌п╟б╩ п╬п╠я─п╟я┌п╦я┌п╣я│я▄ п╡ я─п╟п╥п╢п╣п╩ б╚Choosing a Repository Layoutб╩):

/paint/trunk
/paint/branches
/paint/tags
/calc/trunk
/calc/branches
/calc/tags

п п╬п╫п╣я┤п╫п╬, п╡я▀ п╪п╬п╤п╣я┌п╣ п╫п╣ п╦я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄ я┌п╟п╨п╦п╣ я┌п╦п©п╬п╡я▀п╣ я│я┌я─я┐п╨я┌я┐я─я▀. п▓я▀ п╪п╬п╤п╣я┌п╣ я│п╢п╣п╩п╟я┌я▄ п╩я▌п╠я┐я▌ я─п╟п╥п╫п╬п╡п╦п╢п╫п╬я│я┌я▄, п╨п╬я┌п╬я─п╟я▐ п╠я┐п╢п╣я┌ я┐п╢п╬п╠п╫п╟ п╢п╩я▐ п╡п╟я│ п╦п╩п╦ п╡п╟я┬п╣п╧ п╨п╬п╪п╟п╫п╢я▀. п÷п╬п╪п╫п╦я┌п╣ п╬ я┌п╬п╪, п╨п╟п╨п╬п╧ п╠я▀ п╡я▀ п╡я▀п╠п╬я─ п╫п╣ я│п╢п╣п╩п╟п╩п╦, п╬п╫ п╪п╬п╤п╣я┌ п╠я▀я┌я▄ п╫п╣ п╬п╨п╬п╫я┤п╟я┌п╣п╩я▄п╫я▀п╪. п╔я─п╟п╫п╦п╩п╦я┴п╣ п╪п╬п╤п╫п╬ я─п╣п╬я─пЁп╟п╫п╦п╥п╬п╡п╟я┌я▄ п╡ п╩я▌п╠п╬п╣ п╡я─п╣п╪я▐. пёя┤п╦я┌я▀п╡п╟я▐ я┌п╬, я┤я┌п╬ п╡п╣я┌п╨п╦ п╦ п╪п╣я┌п╨п╦ я▐п╡п╩я▐я▌я┌я│я▐ п╬п╠я▀я┤п╫я▀п╪п╦ п╢п╦я─п╣п╨я┌п╬я─п╦я▐п╪п╦, п╨п╬п╪п╟п╫п╢п╟ svn move п╪п╬п╤п╣я┌ п©п╣я─п╣п╪п╣я│я┌п╦я┌я▄ п╦п╩п╦ п©п╣я─п╣п╦п╪п╣п╫п╬п╡п╟я┌я▄ п╦я┘ п©п╬ п╡п╟я┬п╣п╪я┐ я┐я│п╪п╬я┌я─п╣п╫п╦я▌. п÷п╣я─п╣я┘п╬п╢ п╬я┌ п╬п╢п╫п╬п╧ я│я┌я─я┐п╨я┌я┐я─я▀ п╨ п╢я─я┐пЁп╬п╧ п╬п╥п╫п╟я┤п╟п╣я┌ п©я─п╬я│я┌п╬ п╫п╣я│п╨п╬п╩я▄п╨п╬ п©п╬я│п╩п╣п╢п╬п╡п╟я┌п╣п╩я▄п╫я▀я┘ п©п╣я─п╣п╢п╡п╦п╤п╣п╨ п╫п╟ я│п╣я─п╡п╣я─п╣; п╣я│п╩п╦ п╬я─пЁп╟п╫п╦п╥п╟я├п╦я▐ я┘я─п╟п╫п╦п╩п╦я┴п╟ п╡п╟п╪ п╫п╣ п╫я─п╟п╡п╦я┌я│я▐, п©я─п╬я│я┌п╬ п©п╬п╪п╣п╫я▐п╧я┌п╣ п╪п╣я│я┌п╟п╪п╦ п╢п╦я─п╣п╨я┌п╬я─п╦п╦.

п·п╢п╫п╟п╨п╬ п╫п╣ п╥п╟п╠я▀п╡п╟п╧я┌п╣ п╬ я┌п╬п╪, я┤я┌п╬ п╫п╣я│п╪п╬я┌я─я▐ п╫п╟ п╩п╣пЁп╨п╬я│я┌я▄ п©п╣я─п╣п╪п╣я┴п╣п╫п╦я▐ п╢п╦я─п╣п╨я┌п╬я─п╦п╧, п╫я┐п╤п╫п╬ п©п╬п╪п╫п╦я┌я▄ п╦ п╬ п╢я─я┐пЁп╦я┘ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐я┘. п▓п╟я┬п╦ п©п╣я─п╣я│я┌п╟п╫п╬п╡п╨п╦ п╪п╬пЁя┐я┌ п╢п╣п╥п╬я─п╦п╣п╫я┌п╦я─п╬п╡п╟я┌я▄ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╣п╧ я│ я│я┐я┴п╣я│я┌п╡я┐я▌я┴п╦п╪п╦ я─п╟п╠п╬я┤п╦п╪п╦ п╨п╬п©п╦я▐п╪п╦. п∙я│п╩п╦ я┐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▐ п╣я│я┌я▄ я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ п╬я┌п╢п╣п╩я▄п╫п╬п╧ п╢п╦я─п╣п╨я┌п╬я─п╦п╦ я┘я─п╟п╫п╦п╩п╦я┴п╟, я┌п╬ п╡п╟я┬п╣ п╦я│п©п╬п╩я▄п╥п╬п╡п╟п╫п╦п╣ svn move п╪п╬п╤п╣я┌ я┐п╢п╟п╩п╦я┌я▄ я█я┌п╬я┌ п©я┐я┌я▄ п╦п╥ п©п╬я│п╩п╣п╢п╫п╣п╧ п©я─п╟п╡п╨п╦. п п╬пЁп╢п╟ п╡ п╬я┤п╣я─п╣п╢п╫п╬п╧ я─п╟п╥ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄ п╥п╟п©я┐я│я┌п╦я┌ svn update, п╬п╫ п╠я┐п╢п╣я┌ п©я─п╬п╦п╫я└п╬я─п╪п╦я─п╬п╡п╟п╫ п╬ я┌п╬п╪, я┤я┌п╬ п╣пЁп╬ я─п╟п╠п╬я┤п╟я▐ п╨п╬п©п╦я▐ п╬я┌я─п╟п╤п╟п╣я┌ п©я┐я┌я▄, п╨п╬я┌п╬я─я▀п╧ п╠п╬п╩я▄я┬п╣ п╫п╣ я│я┐я┴п╣я│я┌п╡я┐п╣я┌, п╦ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩я▄ п╠я┐п╢п╣я┌ п╡я▀п╫я┐п╤п╢п╣п╫ п©п╣я─п╣п╨п╩я▌я┤п╦я┌я▄я│я▐ (svn switch) п╫п╟ п╫п╬п╡п╬п╣ п╪п╣я│я┌п╬п©п╬п╩п╬п╤п╣п╫п╦п╣.

п∙я┴п╣ п╬п╢п╫п╦п╪ п╥п╟п╪п╣я┤п╟я┌п╣п╩я▄п╫я▀п╪ я│п╡п╬п╧я│я┌п╡п╬п╪ п╪п╬п╢п╣п╩п╦ Subversion я▐п╡п╩я▐п╣я┌я│я▐ я┌п╬, я┤я┌п╬ п╡п╣я┌п╨п╦ п╦ п╪п╣я┌п╨п╦ п╪п╬пЁя┐я┌ п╦п╪п╣я┌я▄ п╨п╬п╫п╣я┤п╫я┐я▌ п©я─п╬п╢п╬п╩п╤п╦я┌п╣п╩я▄п╫п╬я│я┌я▄ п╤п╦п╥п╫п╦, я┌п╟п╨ п╤п╣ п╨п╟п╨ п╦ п╡я│п╣ п╢я─я┐пЁп╦п╣ п╡п╣я─я│п╦п╬п╫п╦я─п╬п╡п╟п╫п╫я▀п╣ я█п╩п╣п╪п╣п╫я┌я▀. п²п╟п©я─п╦п╪п╣я─, п©я─п╣п╢п©п╬п╩п╬п╤п╦п╪ п╡я▀ п╫п╟п╨п╬п╫п╣я├ п╥п╟п╨п╬п╫я┤п╦п╩п╦ п╡я│п╣ я─п╟п╠п╬я┌я▀ п╡ п╡п╟я┬п╣ п╩п╦я┤п╫п╬п╧ п╡п╣я┌п╨п╣ п©я─п╬п╣п╨я┌п╟ calc. п÷п╬я│п╩п╣ п╬п╠я┼п╣п╢п╦п╫п╣п╫п╦я▐ п╦п╥п╪п╣п╫п╣п╫п╦п╧ я│ /calc/trunk, п╫п╣я┌ п©я─п╦я┤п╦п╫ п©я─п╬п╢п╬п╩п╤п╟я┌я▄ я┘я─п╟п╫п╦я┌я▄ я█я┌я┐ п╡п╣я┌п╨я┐:

$ svn delete http://svn.example.com/repos/calc/branches/my-calc-branch \
             -m "Removing obsolete branch of calc project."

Committed revision 375.

п▒п╬п╩я▄я┬п╣ п╡п╟я┬п╣п╧ п╡п╣я┌п╨п╦ п╫п╣ я│я┐я┴п╣я│я┌п╡я┐п╣я┌. п п╬п╫п╣я┤п╫п╬, п╫п╟ я│п╟п╪п╬п╪ п╢п╣п╩п╣ п╬п╫п╟ п╫п╣ п╦я│я┤п╣п╥п╩п╟: п©я─п╬я│я┌п╬ п╣п╣ п╠п╬п╩я▄я┬п╣ п╫п╣я┌ п╡ п©я─п╟п╡п╨п╣ HEAD, п╬п╫п╟ п╠п╬п╩я▄я┬п╣ п╫п╦п╨п╬пЁп╬ п╫п╣ п╬я┌п╡п╩п╣п╨п╟п╣я┌. п∙я│п╩п╦ п╡п╬я│п©п╬п╩я▄п╥п╬п╡п╟я┌я▄я│я▐ п╨п╬п╪п╟п╫п╢п╟п╪п╦ svn checkout, svn switch п╦п╩п╦ svn list п╢п╩я▐ п╬п╠я─п╟я┴п╣п╫п╦я▐ п╨ я─п╟п╫п╫п╦п╪ п©я─п╟п╡п╨п╟п╪, я│п╡п╬я▌ я│я┌п╟я─я┐я▌ п╡п╣я┌п╨я┐ п╡я▀ я┐п╡п╦п╢п╦я┌п╣.

п∙я│п╩п╦ п©я─п╬я│п╪п╬я┌я─п╟ я┐п╢п╟п╩п╣п╫п╫п╬п╧ п╢п╦я─п╣п╨я┌п╬я─п╦п╦ п╫п╣ п╢п╬я│я┌п╟я┌п╬я┤п╫п╬, п╡я▀ п╡я│п╣пЁп╢п╟ п╪п╬п╤п╣я┌п╣ п╡п╬я│я│я┌п╟п╫п╬п╡п╦я┌я▄ я█я┌я┐ п╢п╦я─п╣п╨я┌п╬я─п╦я▌. п▓п╬я│я│я┌п╟п╫п╬п╡п╩п╣п╫п╦п╣ п╦п╫я└п╬я─п╪п╟я├п╦п╦ п╡ Subversion п╡я▀п©п╬п╩п╫п╦я┌я▄ п╬я┤п╣п╫я▄ п©я─п╬я│я┌п╬. п∙я│п╩п╦ п╣я│я┌я▄ п╢п╦я─п╣п╨я┌п╬я─п╦я▐ п╦п╩п╦ я└п╟п╧п╩, п╨п╬я┌п╬я─я▀п╧ п╡я▀ я┘п╬я┌п╦я┌п╣ п╡п╣я─п╫я┐я┌я▄ п╬п╠я─п╟я┌п╫п╬ п╡ HEAD, п©я─п╬я│я┌п╬ п╡п╬я│п©п╬п╩я▄п╥я┐п╧я┌п╣я│я▄ svn copy -r п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬ п╠я▀ я│п╨п╬п©п╦я─п╬п╡п╟я┌я▄ п╣пЁп╬ п╦п╥ я│я┌п╟я─п╬п╧ п©я─п╟п╡п╨п╦:

$ svn copy -r 374 http://svn.example.com/repos/calc/branches/my-calc-branch \
                  http://svn.example.com/repos/calc/branches/my-calc-branch

Committed revision 376.

п▓ п╫п╟я┬п╣п╪ п©я─п╦п╪п╣я─п╣ п╡п╟я┬п╟ п╩п╦я┤п╫п╟я▐ п╡п╣я┌п╨п╟ п╦п╪п╣п╣я┌ п╬я┌п╫п╬я│п╦я┌п╣п╩я▄п╫п╬ п╨п╬я─п╬я┌п╨я┐я▌ п©я─п╬п╢п╬п╩п╤п╦я┌п╣п╩я▄п╫п╬я│я┌я▄ п╤п╦п╥п╫п╦: п╡п╬п╥п╪п╬п╤п╫п╬ п╬п╫п╟ я│п╬п╥п╢п╟п╡п╟п╩п╟я│я▄ п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬ п╠я▀ п╦я│п©я─п╟п╡п╦я┌я▄ п╬я┬п╦п╠п╨я┐ п╦п╩п╦ я─п╣п╟п╩п╦п╥п╬п╡п╟я┌я▄ п╫п╬п╡я┐я▌ я└я┐п╫п╨я├п╦я▌. п÷п╬я│п╩п╣ я┌п╬пЁп╬, п╨п╟п╨ я─п╟п╠п╬я┌п╟ п╥п╟п╡п╣я─я┬п╣п╫п╟, п╥п╟п╡п╣я─я┬п╣п╫п╟ п╦ п╡п╣я┌п╨п╟. п÷я─п╦ я─п╟п╥я─п╟п╠п╬я┌п╨п╣ п©я─п╬пЁя─п╟п╪п╪п╫п╬пЁп╬ п╬п╠п╣я│п©п╣я┤п╣п╫п╦я▐, я┌п╣п╪ п╫п╣ п╪п╣п╫п╣п╣, я┤п╟я│я┌п╬ п╦п╪п╣я▌я┌ п╢п╡п╣ б╚пЁп╩п╟п╡п╫я▀я┘б╩ п╡п╣я┌п╨п╦, я│я┐я┴п╣я│я┌п╡я┐я▌я┴п╦я┘ я─я▐п╢п╬п╪ п╢п╬п╡п╬п╩я▄п╫п╬ п╢п╬п╩пЁп╬п╣ п╡я─п╣п╪я▐. п■п╬п©я┐я│я┌п╦п╪, п©я─п╦я┬п╩п╬ п╡я─п╣п╪я▐ п╡я▀п©я┐я│я┌п╦я┌я▄ я─п╣п╩п╦п╥ я│я┌п╟п╠п╦п╩я▄п╫п╬п╧ п╡п╣я─я│п╦п╦ п©я─п╬п╣п╨я┌п╟ calc, п╟ п╡я▀ п╥п╫п╟п╣я┌п╣, я┤я┌п╬ п╫я┐п╤п╫п╟ п╠я┐п╢п╣я┌ п©п╟я─п╟ п╪п╣я│я▐я├п╣п╡ п╢п╩я▐ я┌п╬пЁп╬, я┤я┌п╬ п╠я▀ п╡я▀я┌я─я▐я│я┌п╦ п╦п╥ п©я─п╬пЁя─п╟п╪п╪я▀ п©п╬я│п╩п╣п╢п╫п╦п╣ п╬я┬п╦п╠п╨п╦. п═п╟п╥я─п╟п╠п╬я┌я┤п╦п╨п╦ п╫п╣ п╢п╬п╩п╤п╫я▀ п╢п╬п╠п╟п╡п╩я▐я┌я▄ п╡ п©я─п╬п╣п╨я┌ п╫п╬п╡я▀я┘ я└я┐п╫п╨я├п╦п╦, п╫п╬ п©я─п╦ я█я┌п╬п╪ п╦ я─п╟п╠п╬я┌п╟ п╫п╣ п╢п╬п╩п╤п╫п╟ п╬я│я┌п╟п╫п╟п╡п╩п╦п╡п╟я┌я▄я│я▐. п▓ п©п╬п╢п╬п╠п╫п╬п╧ я│п╦я┌я┐п╟я├п╦п╦ я│п╬п╥п╢п╟п╣я┌я│я▐ б╚я│я┌п╟п╠п╦п╩я▄п╫п╟я▐б╩ п╡п╣я┌п╨п╟ п©я─п╬пЁя─п╟п╪п╪я▀, п╨п╬я┌п╬я─п╟я▐ я│я┐я┴п╣я│я┌п╡п╣п╫п╫п╬ п╦п╥п╪п╣п╫я▐я┌я▄я│я▐ я┐п╤п╣ п╫п╣ п╠я┐п╢п╣я┌:

$ svn copy http://svn.example.com/repos/calc/trunk \
         http://svn.example.com/repos/calc/branches/stable-1.0 \
         -m "Creating stable branch of calc project."

Committed revision 377.

п÷п╬я│п╩п╣ я█я┌п╬пЁп╬, я─п╟п╥я─п╟п╠п╬я┌я┤п╦п╨п╟п╪ п╫п╦я┤п╣пЁп╬ п╫п╣ п╪п╣я┬п╟п╣я┌ п©я─п╬п╢п╬п╩п╤п╟я┌я▄ п╢п╬п╠п╟п╡п╩я▐я┌я▄ п╡ /calc/trunk п╫п╬п╡я▀п╣ п©п╣я─п╣п╢п╬п╡я▀п╣ (п╦п╩п╦ я█п╨я│п©п╣я─п╦п╪п╣п╫я┌п╟п╩я▄п╫я▀п╣) я└я┐п╫п╨я├п╦п╦, п╟ п╡ п©я─п╟п╡п╦п╩п╟я┘ п©я─п╬п╣п╨я┌п╟ п╪п╬п╤п╫п╬ я┐п╨п╟п╥п╟я┌я▄, я┤я┌п╬ п╡ /calc/branches/stable-1.0 п╢п╬п╩п╤п╫я▀ я└п╦п╨я│п╦я─п╬п╡п╟я┌я▄я│я▐ я┌п╬п╩я▄п╨п╬ п╦я│п©я─п╟п╡п╩п╣п╫п╦я▐ п╬я┬п╦п╠п╬п╨. п÷п╬ п╪п╣я─п╣ я┌п╬пЁп╬, п╨п╟п╨ п╠я┐п╢п╣я┌ п©я─п╬п╢п╡п╦пЁп╟я┌я▄я│я▐ я─п╟п╠п╬я┌п╟ п╫п╟п╢ пЁп╩п╟п╡п╫п╬п╧ п╩п╦п╫п╦п╣п╧ я─п╟п╥я─п╟п╠п╬я┌п╨п╦, п╦я│п©я─п╟п╡п╩п╣п╫п╫я▀п╣ п╬я┬п╦п╠п╨п╦ п╠я┐п╢я┐я┌ п╡я▀п╠п╬я─п╬я┤п╫п╬ п©п╬я─я┌п╦я─п╬п╡п╟я┌я▄я│я▐ п╡ я│я┌п╟п╠п╦п╩я▄п╫я┐я▌ п╡п╣я┌п╨я┐. п■п╟п╤п╣ п©п╬я│п╩п╣ п╡я▀я┘п╬п╢п╟ я─п╣п╩п╦п╥п╟ я│я┌п╟п╠п╦п╩я▄п╫п╬п╧ п╡п╣я┌п╨п╦, п╬п╫п╟ п╪п╬п╤п╣я┌ п©я─п╬п╢п╬п╩п╤п╟я┌я▄ п©п╬п╢п╢п╣я─п╤п╦п╡п╟я┌я▄я│я▐ п╢п╬п╩пЁп╬п╣ п╡я─п╣п╪я▐ Б─■ я│я┌п╬п╩я▄п╨п╬, я│п╨п╬п╩я▄п╨п╬ я█я┌п╬я┌ я─п╣п╩п╦п╥ п╠я┐п╢п╣я┌ п©я─п╬п╢п╬п╩п╤п╟я┌я▄ п©п╬п╢п╢п╣я─п╤п╦п╡п╟я┌я▄я│я▐ п╢п╩я▐ п©п╬п╩я▄п╥п╬п╡п╟я┌п╣п╩п╣п╧.

Managing vendor branches generally works like this. You create a top-level directory (such as /vendor) to hold the vendor branches. Then you import the third party code into a subdirectory of that top-level directory. You then copy that subdirectory into your main development branch (for example, /trunk) at the appropriate location. You always make your local changes in the main development branch. With each new release of the code you are tracking you bring it into the vendor branch and merge the changes into /trunk, resolving whatever conflicts occur between your local changes and the upstream changes.

Perhaps an example will help to clarify this algorithm. We'll use a scenario where your development team is creating a calculator program that links against a third-party complex number arithmetic library, libcomplex. We'll begin with the initial creation of the vendor branch, and the import of the first vendor drop. We'll call our vendor branch directory libcomplex, and our code drops will go into a subdirectory of our vendor branch called current. And since svn import creates all the intermediate parent directories it needs, we can actually accomplish both of these steps with a single command.

$ svn import /path/to/libcomplex-1.0 \
             http://svn.example.com/repos/vendor/libcomplex/current \
             -m 'importing initial 1.0 vendor drop'
Б─╕

We now have the current version of the libcomplex source code in /vendor/libcomplex/current. Now, we tag that version (see б╚п°п╣я┌п╨п╦б╩) and then copy it into the main development branch. Our copy will create a new directory called libcomplex in our existing calc project directory. It is in this copied version of the vendor data that we will make our customizations.

$ svn copy http://svn.example.com/repos/vendor/libcomplex/current  \
           http://svn.example.com/repos/vendor/libcomplex/1.0      \
           -m 'tagging libcomplex-1.0'
Б─╕
$ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0  \
           http://svn.example.com/repos/calc/libcomplex        \
           -m 'bringing libcomplex-1.0 into the main branch'
Б─╕

We check out our project's main branchБ─■which now includes a copy of the first vendor dropБ─■and we get to work customizing the libcomplex code. Before we know it, our modified version of libcomplex is now completely integrated into our calculator program. ^[29]

A few weeks later, the developers of libcomplex release a new version of their libraryБ─■version 1.1Б─■which contains some features and functionality that we really want. We'd like to upgrade to this new version, but without losing the customizations we made to the existing version. What we essentially would like to do is to replace our current baseline version of libcomplex 1.0 with a copy of libcomplex 1.1, and then re-apply the custom modifications we previously made to that library to the new version. But we actually approach the problem from the other direction, applying the changes made to libcomplex between versions 1.0 and 1.1 to our modified copy of it.

To perform this upgrade, we checkout a copy of our vendor branch, and replace the code in the current directory with the new libcomplex 1.1 source code. We quite literally copy new files on top of existing files, perhaps exploding the libcomplex 1.1 release tarball atop our existing files and directories. The goal here is to make our current directory contain only the libcomplex 1.1 code, and to ensure that all that code is under version control. Oh, and we want to do this with as little version control history disturbance as possible.

After replacing the 1.0 code with 1.1 code, svn status will show files with local modifications as well as, perhaps, some unversioned or missing files. If we did what we were supposed to do, the unversioned files are only those new files introduced in the 1.1 release of libcomplexБ─■we run svn add on those to get them under version control. The missing files are files that were in 1.0 but not in 1.1, and on those paths we run svn delete. Finally, once our current working copy contains only the libcomplex 1.1 code, we commit the changes we made to get it looking that way.

Our current branch now contains the new vendor drop. We tag the new version (in the same way we previously tagged the version 1.0 vendor drop), and then merge the differences between the tag of the previous version and the new current version into our main development branch.

$ cd working-copies/calc
$ svn merge http://svn.example.com/repos/vendor/libcomplex/1.0      \
            http://svn.example.com/repos/vendor/libcomplex/current  \
            libcomplex
Б─╕ # resolve all the conflicts between their changes and our changes
$ svn commit -m 'merging libcomplex-1.1 into the main branch'
Б─╕

In the trivial use case, the new version of our third-party tool would look, from a files-and-directories point of view, just like the previous version. None of the libcomplex source files would have been deleted, renamed or moved to different locationsБ─■the new version would contain only textual modifications against the previous one. In a perfect world, our modifications would apply cleanly to the new version of the library, with absolutely no complications or conflicts.

But things aren't always that simple, and in fact it is quite common for source files to get moved around between releases of software. This complicates the process of ensuring that our modifications are still valid for the new version of code, and can quickly degrade into a situation where we have to manually recreate our customizations in the new version. Once Subversion knows about the history of a given source fileБ─■including all its previous locationsБ─■the process of merging in the new version of the library is pretty simple. But we are responsible for telling Subversion how the source file layout changed from vendor drop to vendor drop.

Vendor drops that contain more than a few deletes, additions and moves complicate the process of upgrading to each successive version of the third-party data. So Subversion supplies the svn_load_dirs.pl script to assist with this process. This script automates the importing steps we mentioned in the general vendor branch management procedure to make sure that mistakes are minimized. You will still be responsible for using the merge commands to merge the new versions of the third-party data into your main development branch, but svn_load_dirs.pl can help you more quickly and easily arrive at that stage.

In short, svn_load_dirs.pl is an enhancement to svn import that has several important characteristics:

svn_load_dirs.pl takes three mandatory arguments. The first argument is the URL to the base Subversion directory to work in. This argument is followed by the URLБ─■relative to the first argumentБ─■into which the current vendor drop will be imported. Finally, the third argument is the local directory to import. Using our previous example, a typical run of svn_load_dirs.pl might look like:

$ svn_load_dirs.pl http://svn.example.com/repos/vendor/libcomplex \
                   current                                        \
                   /path/to/libcomplex-1.1
Б─╕

You can indicate that you'd like svn_load_dirs.pl to tag the new vendor drop by passing the -t command-line option and specifying a tag name. This tag is another URL relative to the first program argument.

$ svn_load_dirs.pl -t libcomplex-1.1                              \
                   http://svn.example.com/repos/vendor/libcomplex \
                   current                                        \
                   /path/to/libcomplex-1.1
Б─╕

When you run svn_load_dirs.pl, it examines the contents of your existing б╚currentб╩ vendor drop, and compares them with the proposed new vendor drop. In the trivial case, there will be no files that are in one version and not the other, and the script will perform the new import without incident. If, however, there are discrepancies in the file layouts between versions, svn_load_dirs.pl will prompt you for how you would like to resolve those differences. For example, you will have the opportunity to tell the script that you know that the file math.c in version 1.0 of libcomplex was renamed to arithmetic.c in libcomplex 1.1. Any discrepancies not explained by moves are treated as regular additions and deletions.

The script also accepts a separate configuration file for setting properties on files and directories matching a regular expression that are added to the repository. This configuration file is specified to svn_load_dirs.pl using the -p command-line option. Each line of the configuration file is a whitespace-delimited set of two or four values: a Perl-style regular expression to match the added path against, a control keyword (either break or cont), and then optionally a property name and value.

\.png$              break   svn:mime-type   image/png
\.jpe?g$            break   svn:mime-type   image/jpeg
\.m3u$              cont    svn:mime-type   audio/x-mpegurl
\.m3u$              break   svn:eol-style   LF
.*                  break   svn:eol-style   native

For each added path, the configured property changes whose regular expression matches the path are applied in order, unless the control specification is break (which means that no more property changes should be applied to that path). If the control specification is contБ─■an abbreviation for continueБ─■then matching will continue with the next line of the configuration file.

Any whitespace in the regular expression, property name, or property value must be surrounded by either single or double quote characters. You can escape quote characters that are not used for wrapping whitespace by preceding them with a backslash (\) character. The backslash escapes only quotes when parsing the configuration file, so do not protect any other characters beyond what is necessary for the regular expression.

Conceptually speaking, a Subversion repository is a sequence of directory trees. Each tree is a snapshot of how the files and directories versioned in your repository looked at some point in time. These snapshots are created as a result of client operations, and are called revisions.

Every revision begins life as a transaction tree. When doing a commit, a client builds a Subversion transaction that mirrors their local changes (plus any additional changes that might have been made to the repository since the beginning of the client's commit process), and then instructs the repository to store that tree as the next snapshot in the sequence. If the commit succeeds, the transaction is effectively promoted into a new revision tree, and is assigned a new revision number. If the commit fails for some reason, the transaction is destroyed and the client is informed of the failure.

Updates work in a similar way. The client builds a temporary transaction tree that mirrors the state of the working copy. The repository then compares that transaction tree with the revision tree at the requested revision (usually the most recent, or б╚youngestб╩ tree), and sends back information that informs the client about what changes are needed to transform their working copy into a replica of that revision tree. After the update completes, the temporary transaction is deleted.

The use of transaction trees is the only way to make permanent changes to a repository's versioned filesystem. However, it's important to understand that the lifetime of a transaction is completely flexible. In the case of updates, transactions are temporary trees that are immediately destroyed. In the case of commits, transactions are transformed into permanent revisions (or removed if the commit fails). In the case of an error or bug, it's possible that a transaction can be accidentally left lying around in the repository (not really affecting anything, but still taking up space).

In theory, someday whole workflow applications might revolve around more fine-grained control of transaction lifetime. It is feasible to imagine a system whereby each transaction slated to become a revision is left in stasis well after the client finishes describing its changes to repository. This would enable each new commit to be reviewed by someone else, perhaps a manager or engineering QA team, who can choose to promote the transaction into a revision, or abort it.

Transactions and revisions in the Subversion repository can have properties attached to them. These properties are generic key-to-value mappings, and are generally used to store information about the tree to which they are attached. The names and values of these properties are stored in the repository's filesystem, along with the rest of your tree data.

Revision and transaction properties are useful for associating information with a tree that is not strictly related to the files and directories in that treeБ─■the kind of information that isn't managed by client working copies. For example, when a new commit transaction is created in the repository, Subversion adds a property to that transaction named svn:dateБ─■a datestamp representing the time that the transaction was created. By the time the commit process is finished, and the transaction is promoted to a permanent revision, the tree has also been given a property to store the username of the revision's author (svn:author) and a property to store the log message attached to that revision (svn:log).

Revision and transaction properties are unversioned propertiesБ─■as they are modified, their previous values are permanently discarded. Also, while revision trees themselves are immutable, the properties attached to those trees are not. You can add, remove, and modify revision properties at any time in the future. If you commit a new revision and later realize that you had some misinformation or spelling error in your log message, you can simply replace the value of the svn:log property with a new, corrected log message.

As of Subversion 1.1, there are two options for storing data in a Subversion repository. One type of repository stores everything in a Berkeley DB database; the other kind stores data in ordinary flat files, using a custom format. Because Subversion developers often refer to a repository as б╚the (versioned) filesystemб╩, they have adopted the habit of referring to the latter type of repository as FSFS ^[31] Б─■a versioned filesystem implementation that uses the native OS filesystem to store data.

When a repository is created, an administrator must decide whether it will use Berkeley DB or FSFS. There are advantages and disadvantages to each, which we'll describe in a bit. Neither back-end is more б╚officialб╩ than another, and programs which access the repository are insulated from this implementation detail. Programs have no idea how a repository is storing data; they only see revision and transaction trees through the repository API.

п╒п╟п╠п╩п╦я├п╟б═5.1, б╚Repository Data Store Comparisonб╩ gives a comparative overview of Berkeley DB and FSFS repositories. The next sections go into detail.

A hook is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way.

The hooks subdirectory is, by default, filled with templates for various repository hooks.

$ ls repos/hooks/
post-commit.tmpl          post-unlock.tmpl          pre-revprop-change.tmpl
post-lock.tmpl            pre-commit.tmpl           pre-unlock.tmpl
post-revprop-change.tmpl  pre-lock.tmpl             start-commit.tmpl

There is one template for each hook that the Subversion repository implements, and by examining the contents of those template scripts, you can see what triggers each such script to run and what data is passed to that script. Also present in many of these templates are examples of how one might use that script, in conjunction with other Subversion-supplied programs, to perform common useful tasks. To actually install a working hook, you need only place some executable program or script into the repos/hooks directory which can be executed as the name (like start-commit or post-commit) of the hook.

On Unix platforms, this means supplying a script or program (which could be a shell script, a Python program, a compiled C binary, or any number of other things) named exactly like the name of the hook. Of course, the template files are present for more than just informational purposesБ─■the easiest way to install a hook on Unix platforms is to simply copy the appropriate template file to a new file that lacks the .tmpl extension, customize the hook's contents, and ensure that the script is executable. Windows, however, uses file extensions to determine whether or not a program is executable, so you would need to supply a program whose basename is the name of the hook, and whose extension is one of the special extensions recognized by Windows for executable programs, such as .exe or .com for programs, and .bat for batch files.

п÷п╬п╢я│п╨п╟п╥п╨п╟

For security reasons, the Subversion repository executes hook scripts with an empty environmentБ─■that is, no environment variables are set at all, not even $PATH or %PATH%. Because of this, a lot of administrators are baffled when their hook script runs fine by hand, but doesn't work when run by Subversion. Be sure to explicitly set environment variables in your hook and/or use absolute paths to programs.

There are nine hooks implemented by the Subversion repository:

п▓п╫п╦п╪п╟п╫п╦п╣

Do not attempt to modify the transaction using hook scripts. A common example of this would be to automatically set properties such as svn:eol-style or svn:mime-type during the commit. While this might seem like a good idea, it causes problems. The main problem is that the client does not know about the change made by the hook script, and there is no way to inform the client that it is out-of-date. This inconsistency can lead to surprising and unexpected behavior. Instead of attempting to modify the transaction, it is much better to check the transaction in the pre-commit hook and reject the commit if it does not meet the desired requirements.

Subversion will attempt to execute hooks as the same user who owns the process which is accessing the Subversion repository. In most cases, the repository is being accessed via Apache HTTP server and mod_dav_svn, so this user is the same user that Apache runs as. The hooks themselves will need to be configured with OS-level permissions that allow that user to execute them. Also, this means that any file or programs (including the Subversion repository itself) accessed directly or indirectly by the hook will be accessed as the same user. In other words, be alert to potential permission-related problems that could prevent the hook from performing the tasks you've written it to perform.

A Berkeley DB environment is an encapsulation of one or more databases, log files, region files and configuration files. The Berkeley DB environment has its own set of default configuration values for things like the number of database locks allowed to be taken out at any given time, or the maximum size of the journaling log files, etc. Subversion's filesystem code additionally chooses default values for some of the Berkeley DB configuration options. However, sometimes your particular repository, with its unique collection of data and access patterns, might require a different set of configuration option values.

The folks at Sleepycat (the producers of Berkeley DB) understand that different databases have different requirements, and so they have provided a mechanism for overriding at runtime many of the configuration values for the Berkeley DB environment. Berkeley checks for the presence of a file named DB_CONFIG in each environment directory, and parses the options found in that file for use with that particular Berkeley environment.

The Berkeley configuration file for your repository is located in the db environment directory, at repos/db/DB_CONFIG. Subversion itself creates this file when it creates the rest of the repository. The file initially contains some default options, as well as pointers to the Berkeley DB online documentation so you can read about what those options do. Of course, you are free to add any of the supported Berkeley DB options to your DB_CONFIG file. Just be aware that while Subversion never attempts to read or interpret the contents of the file, and makes no use of the option settings in it, you'll want to avoid any configuration changes that may cause Berkeley DB to behave in a fashion that is unexpected by the rest of the Subversion code. Also, changes made to DB_CONFIG won't take effect until you recover the database environment (using svnadmin recover).

Subversion provides a handful of utilities useful for creating, inspecting, modifying and repairing your repository. Let's look more closely at each of those tools. Afterward, we'll briefly examine some of the utilities included in the Berkeley DB distribution that provide functionality specific to your repository's database backend not otherwise provided by Subversion's own tools.

$ svnlook help
general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]
Note: any subcommand which takes the '--revision' and '--transaction'
      options will, if invoked without one of those options, act on
      the repository's youngest revision.
Type "svnlook help <subcommand>" for help on a specific subcommand.
Б─╕

$ svnlook info /path/to/repos
$ svnlook info /path/to/repos --revision 19

$ svnlook youngest /path/to/repos
19

$ svnlook info /path/to/repos
sally
2002-11-04 09:29:13 -0600 (Mon, 04 Nov 2002)
27
Added the usual
Greek tree.

$ svnlook tree /path/to/repos --show-ids
/ <0.0.1>
 A/ <2.0.1>
  B/ <4.0.1>
   lambda <5.0.1>
   E/ <6.0.1>
    alpha <7.0.1>
    beta <8.0.1>
   F/ <9.0.1>
  mu <3.0.1>
  C/ <a.0.1>
  D/ <b.0.1>
   gamma <c.0.1>
   G/ <d.0.1>
    pi <e.0.1>
    rho <f.0.1>
    tau <g.0.1>
   H/ <h.0.1>
    chi <i.0.1>
    omega <k.0.1>
    psi <j.0.1>
 iota <1.0.1>

$ svnadmin help
general usage: svnadmin SUBCOMMAND REPOS_PATH  [ARGS & OPTIONS ...]
Type "svnadmin help <subcommand>" for help on a specific subcommand.

Available subcommands:
   create
   deltify
   dump
   help (?, h)
Б─╕

svndumpfilter

Since Subversion stores everything in an opaque database system, attempting manual tweaks is unwise, if not quite difficult. And once data has been stored in your repository, Subversion generally doesn't provide an easy way to remove that data. ^[32] But inevitably, there will be times when you would like to manipulate the history of your repository. You might need to strip out all instances of a file that was accidentally added to the repository (and shouldn't be there for whatever reason). Or, perhaps you have multiple projects sharing a single repository, and you decide to split them up into their own repositories. To accomplish tasks like this, administrators need a more manageable and malleable representation of the data in their repositoriesБ─■the Subversion repository dump format.

The Subversion repository dump format is a human-readable representation of the changes that you've made to your versioned data over time. You use the svnadmin dump command to generate the dump data, and svnadmin load to populate a new repository with it (see б╚Migrating a Repositoryб╩). The great thing about the human-readability aspect of the dump format is that, if you aren't careless about it, you can manually inspect and modify it. Of course, the downside is that if you have two years' worth of repository activity encapsulated in what is likely to be a very large dump file, it could take you a long, long time to manually inspect and modify it.

While it won't be the most commonly used tool at the administrator's disposal, svndumpfilter provides a very particular brand of useful functionalityБ─■the ability to quickly and easily modify that dump data by acting as a path-based filter. Simply give it either a list of paths you wish to keep, or a list of paths you wish to not keep, then pipe your repository dump data through this filter. The result will be a modified stream of dump data that contains only the versioned paths you (explicitly or implicitly) requested.

The syntax of svndumpfilter is as follows:

$ svndumpfilter help
general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]
Type "svndumpfilter help <subcommand>" for help on a specific subcommand.

Available subcommands:
   exclude
   include
   help (?, h)

There are only two interesting subcommands. They allow you to make the choice between explicit or implicit inclusion of paths in the stream:

exclude

Filter out a set of paths from the dump data stream.

include

Allow only the requested set of paths to pass through the dump data stream.

Let's look a realistic example of how you might use this program. We discuss elsewhere (see б╚Choosing a Repository Layoutб╩) the process of deciding how to choose a layout for the data in your repositoriesБ─■using one repository per project or combining them, arranging stuff within your repository, and so on. But sometimes after new revisions start flying in, you rethink your layout and would like to make some changes. A common change is the decision to move multiple projects which are sharing a single repository into separate repositories for each project.

Our imaginary repository contains three projects: calc, calendar, and spreadsheet. They have been living side-by-side in a layout like this:

/
   calc/
      trunk/
      branches/
      tags/
   calendar/
      trunk/
      branches/
      tags/
   spreadsheet/
      trunk/
      branches/
      tags/

To get these three projects into their own repositories, we first dump the whole repository:

$ svnadmin dump /path/to/repos > repos-dumpfile
* Dumped revision 0.
* Dumped revision 1.
* Dumped revision 2.
* Dumped revision 3.
Б─╕
$

Next, run that dump file through the filter, each time including only one of our top-level directories, and resulting in three new dump files:

$ svndumpfilter include calc < repos-dumpfile > calc-dumpfile
Б─╕
$ svndumpfilter include calendar < repos-dumpfile > cal-dumpfile
Б─╕
$ svndumpfilter include spreadsheet < repos-dumpfile > ss-dumpfile
Б─╕
$

At this point, you have to make a decision. Each of your dump files will create a valid repository, but will preserve the paths exactly as they were in the original repository. This means that even though you would have a repository solely for your calc project, that repository would still have a top-level directory named calc. If you want your trunk, tags, and branches directories to live in the root of your repository, you might wish to edit your dump files, tweaking the Node-path and Node-copyfrom-path headers to no longer have that first calc/ path component. Also, you'll want to remove the section of dump data that creates the calc directory. It will look something like:

Node-path: calc
Node-action: add
Node-kind: dir
Content-length: 0

	п▓п╫п╦п╪п╟п╫п╦п╣
	If you do plan on manually editing the dump file to remove a top-level directory, make sure that your editor is not set to automatically convert end-lines to the native format (e.g. \r\n to \n) as the content will then not agree with the metadata and this will render the dump file useless.

All that remains now is to create your three new repositories, and load each dump file into the right repository:

$ svnadmin create calc; svnadmin load calc < calc-dumpfile
<<< Started new transaction, based on original revision 1
     * adding path : Makefile ... done.
     * adding path : button.c ... done.
Б─╕
$ svnadmin create calendar; svnadmin load calendar < cal-dumpfile
<<< Started new transaction, based on original revision 1
     * adding path : Makefile ... done.
     * adding path : cal.c ... done.
Б─╕
$ svnadmin create spreadsheet; svnadmin load spreadsheet < ss-dumpfile
<<< Started new transaction, based on original revision 1
     * adding path : Makefile ... done.
     * adding path : ss.c ... done.
Б─╕
$

Both of svndumpfilter's subcommands accept options for deciding how to deal with б╚emptyб╩ revisions. If a given revision contained only changes to paths that were filtered out, that now-empty revision could be considered uninteresting or even unwanted. So to give the user control over what to do with those revisions, svndumpfilter provides the following command-line options:

--drop-empty-revs

Do not generate empty revisions at allБ─■just omit them.

--renumber-revs

If empty revisions are dropped (using the --drop-empty-revs option), change the revision numbers of the remaining revisions so that there are no gaps in the numeric sequence.

--preserve-revprops

If empty revisions are not dropped, preserve the revision properties (log message, author, date, custom properties, etc.) for those empty revisions. Otherwise, empty revisions will only contain the original datestamp, and a generated log message that indicates that this revision was emptied by svndumpfilter.

While svndumpfilter can be very useful, and a huge timesaver, there are unfortunately a couple of gotchas. First, this utility is overly sensitive to path semantics. Pay attention to whether paths in your dump file are specified with or without leading slashes. You'll want to look at the Node-path and Node-copyfrom-path headers.

Б─╕
Node-path: spreadsheet/Makefile
Б─╕

If the paths have leading slashes, you should include leading slashes in the paths you pass to svndumpfilter include and svndumpfilter exclude (and if they don't, you shouldn't). Further, if your dump file has an inconsistent usage of leading slashes for some reason, ^[33] you should probably normalize those paths so they all have, or lack, leading slashes.

Also, copied paths can give you some trouble. Subversion supports copy operations in the repository, where a new path is created by copying some already existing path. It is possible that at some point in the lifetime of your repository, you might have copied a file or directory from some location that svndumpfilter is excluding, to a location that it is including. In order to make the dump data self-sufficient, svndumpfilter needs to still show the addition of the new pathБ─■including the contents of any files created by the copyБ─■and not represent that addition as a copy from a source that won't exist in your filtered dump data stream. But because the Subversion repository dump format only shows what was changed in each revision, the contents of the copy source might not be readily available. If you suspect that you have any copies of this sort in your repository, you might want to rethink your set of included/excluded paths.

Your Subversion repository will generally require very little attention once it is configured to your liking. However, there are times when some manual assistance from an administrator might be in order. The svnadmin utility provides some helpful functionality to assist you in performing such tasks as:

Perhaps the most commonly used of svnadmin's subcommands is setlog. When a transaction is committed to the repository and promoted to a revision, the descriptive log message associated with that new revision (and provided by the user) is stored as an unversioned property attached to the revision itself. In other words, the repository remembers only the latest value of the property, and discards previous ones.

Sometimes a user will have an error in her log message (a misspelling or some misinformation, perhaps). If the repository is configured (using the pre-revprop-change and post-revprop-change hooks; see б╚Hook Scriptsб╩) to accept changes to this log message after the commit is finished, then the user can б╚fixб╩ her log message remotely using the svn program's propset command (see п⌠п╩п╟п╡п╟б═9, п÷п╬п╩п╫п╬п╣ я│п©я─п╟п╡п╬я┤п╫п╬п╣ я─я┐п╨п╬п╡п╬п╢я│я┌п╡п╬ п©п╬ Subversion). However, because of the potential to lose information forever, Subversion repositories are not, by default, configured to allow changes to unversioned propertiesБ─■except by an administrator.

If a log message needs to be changed by an administrator, this can be done using svnadmin setlog. This command changes the log message (the svn:log property) on a given revision of a repository, reading the new value from a provided file.

$ echo "Here is the new, correct log message" > newlog.txt
$ svnadmin setlog myrepos newlog.txt -r 388

The svnadmin setlog command alone is still bound by the same protections against modifying unversioned properties as a remote client isБ─■the pre- and post-revprop-change hooks are still triggered, and therefore must be setup to accept changes of this nature. But an administrator can get around these protections by passing the --bypass-hooks option to the svnadmin setlog command.

	п▓п╫п╦п╪п╟п╫п╦п╣
	Remember, though, that by bypassing the hooks, you are likely avoiding such things as email notifications of property changes, backup systems which track unversioned property changes, and so on. In other words, be very careful about what you are changing, and how you change it.

Another common use of svnadmin is to query the repository for outstandingБ─■possibly deadБ─■Subversion transactions. In the event that a commit should fail, the transaction is usually cleaned up. That is, the transaction itself is removed from the repository, and any data associated with (and only with) that transaction is removed as well. Occasionally, though, a failure occurs in such a way that the cleanup of the transaction never happens. This could happen for several reasons: perhaps the client operation was inelegantly terminated by the user, or a network failure might have occurred in the middle of an operation, etc. Regardless of the reason, dead transactions can happen. They don't do any real harm, other than consuming a small bit of disk space. A fastidious administrator may nonetheless want to remove them.

You can use svnadmin's lstxns command to list the names of the currently outstanding transactions.

$ svnadmin lstxns myrepos
19
3a1
a45
$

Each item in the resultant output can then be used with svnlook (and its --transaction option) to determine who created the transaction, when it was created, what types of changes were made in the transactionБ─■in other words, whether or not the transaction is a safe candidate for removal! If so, the transaction's name can be passed to svnadmin rmtxns, which will perform the cleanup of the transaction. In fact, the rmtxns subcommand can take its input directly from the output of lstxns!

$ svnadmin rmtxns myrepos `svnadmin lstxns myrepos`
$

If you use these two subcommands like this, you should consider making your repository temporarily inaccessible to clients. That way, no one can begin a legitimate transaction before you start your cleanup. The following is a little bit of shell-scripting that can quickly generate information about each outstanding transaction in your repository:

#!/bin/sh

### Generate informational output for all outstanding transactions in
### a Subversion repository.

REPOS="${1}"
if [ "x$REPOS" = x ] ; then
  echo "usage: $0 REPOS_PATH"
  exit
fi

for TXN in `svnadmin lstxns ${REPOS}`; do
  echo "---[ Transaction ${TXN} ]-------------------------------------------"
  svnlook info "${REPOS}" --transaction "${TXN}"
done

You can run the previous script using /path/to/txn-info.sh /path/to/repos. The output is basically a concatenation of several chunks of svnlook info output (see б╚svnlookб╩), and will look something like:

$ txn-info.sh myrepos
---[ Transaction 19 ]-------------------------------------------
sally
2001-09-04 11:57:19 -0500 (Tue, 04 Sep 2001)
0
---[ Transaction 3a1 ]-------------------------------------------
harry
2001-09-10 16:50:30 -0500 (Mon, 10 Sep 2001)
39
Trying to commit over a faulty network.
---[ Transaction a45 ]-------------------------------------------
sally
2001-09-12 11:09:28 -0500 (Wed, 12 Sep 2001)
0
$

A long-abandoned transaction usually represents some sort of failed or interrupted commit. A transaction's datestamp can provide interesting informationБ─■for example, how likely is it that an operation begun nine months ago is still active?

In short, transaction cleanup decisions need not be made unwisely. Various sources of informationБ─■including Apache's error and access logs, the logs of successful Subversion commits, and so onБ─■can be employed in the decision-making process. Finally, an administrator can often simply communicate with a seemingly dead transaction's owner (via email, for example) to verify that the transaction is, in fact, in a zombie state.

While the cost of storage has dropped incredibly in the past few years, disk usage is still a valid concern for administrators seeking to version large amounts of data. Every additional byte consumed by the live repository is a byte that needs to be backed up offsite, perhaps multiple times as part of rotating backup schedules. If using a Berkeley DB repository, the primary storage mechanism is a complex database system, it is useful to know what pieces of data need to remain on the live site, which need to be backed up, and which can be safely removed. This section is specific to Berkeley DB; FSFS repositories have no extra data to be cleaned up or reclaimed.

Until recently, the largest offender of disk space usage with respect to Subversion repositories was the log files to which Berkeley DB performs its pre-writes before modifying the actual database files. These files capture all the actions taken along the route of changing the database from one state to anotherБ─■while the database files reflect at any given time some state, the log files contain all the many changes along the way between states. As such, they can start to accumulate quite rapidly.

Fortunately, beginning with the 4.2 release of Berkeley DB, the database environment has the ability to remove its own unused log files without any external procedures. Any repositories created using an svnadmin which is compiled against Berkeley DB version 4.2 or greater will be configured for this automatic log file removal. If you don't want this feature enabled, simply pass the --bdb-log-keep option to the svnadmin create command. If you forget to do this, or change your mind at a later time, simple edit the DB_CONFIG file found in your repository's db directory, comment out the line which contains the set_flags DB_LOG_AUTOREMOVE directive, and then run svnadmin recover on your repository to force the configuration changes to take effect. See б╚Berkeley DB Configurationб╩ for more information about database configuration.

Without some sort of automatic log file removal in place, log files will accumulate as you use your repository. This is actually somewhat of a feature of the database systemБ─■you should be able to recreate your entire database using nothing but the log files, so these files can be useful for catastrophic database recovery. But typically, you'll want to archive the log files that are no longer in use by Berkeley DB, and then remove them from disk to conserve space. Use the svnadmin list-unused-dblogs command to list the unused log files:

$ svnadmin list-unused-dblogs /path/to/repos
/path/to/repos/log.0000000031
/path/to/repos/log.0000000032
/path/to/repos/log.0000000033

$ svnadmin list-unused-dblogs /path/to/repos | xargs rm
## disk space reclaimed!

To keep the size of the repository as small as possible, Subversion uses deltification (or, б╚deltified storageб╩) within the repository itself. Deltification involves encoding the representation of a chunk of data as a collection of differences against some other chunk of data. If the two pieces of data are very similar, this deltification results in storage savings for the deltified chunkБ─■rather than taking up space equal to the size of the original data, it only takes up enough space to say, б╚I look just like this other piece of data over here, except for the following couple of changesб╩. Specifically, each time a new version of a file is committed to the repository, Subversion encodes the previous version (actually, several previous versions) as a delta against the new version. The result is that most of the repository data that tends to be sizableБ─■namely, the contents of versioned filesБ─■is stored at a much smaller size than the original б╚fulltextб╩ representation of that data.

п≈п╟п╪п╣я┤п╟п╫п╦п╣

Because all of the Subversion repository data that is subject to deltification is stored in a single Berkeley DB database file, reducing the size of the stored values will not necessarily reduce the size of the database file itself. Berkeley DB will, however, keep internal records of unused areas of the database file, and use those areas first before growing the size of the database file. So while deltification doesn't produce immediate space savings, it can drastically slow future growth of the database.

As mentioned in б╚Berkeley DBб╩, a Berkeley DB repository can sometimes be left in frozen state if not closed properly. When this happens, an administrator needs to rewind the database back into a consistent state.

In order to protect the data in your repository, Berkeley DB uses a locking mechanism. This mechanism ensures that portions of the database are not simultaneously modified by multiple database accessors, and that each process sees the data in the correct state when that data is being read from the database. When a process needs to change something in the database, it first checks for the existence of a lock on the target data. If the data is not locked, the process locks the data, makes the change it wants to make, and then unlocks the data. Other processes are forced to wait until that lock is removed before they are permitted to continue accessing that section of the database. (This has nothing to do with the locks that you, as a user, can apply to versioned files within the repository; see Three meanings of б╚lockб╩ for more information.)

In the course of using your Subversion repository, fatal errors (such as running out of disk space or available memory) or interruptions can prevent a process from having the chance to remove the locks it has placed in the database. The result is that the back-end database system gets б╚wedgedб╩. When this happens, any attempts to access the repository hang indefinitely (since each new accessor is waiting for a lock to go awayБ─■which isn't going to happen).

First, if this happens to your repository, don't panic. The Berkeley DB filesystem takes advantage of database transactions and checkpoints and pre-write journaling to ensure that only the most catastrophic of events ^[34] can permanently destroy a database environment. A sufficiently paranoid repository administrator will be making off-site backups of the repository data in some fashion, but don't call your system administrator to restore a backup tape just yet.

Secondly, use the following recipe to attempt to б╚unwedgeб╩ your repository:

This procedure fixes almost every case of repository lock-up. Make sure that you run this command as the user that owns and manages the database, not just as root. Part of the recovery process might involve recreating from scratch various database files (shared memory regions, for example). Recovering as root will create those files such that they are owned by root, which means that even after you restore connectivity to your repository, regular users will be unable to access it.

If the previous procedure, for some reason, does not successfully unwedge your repository, you should do two things. First, move your broken repository out of the way and restore your latest backup of it. Then, send an email to the Subversion user list (at <users@subversion.tigris.org>) describing your problem in detail. Data integrity is an extremely high priority to the Subversion developers.

A Subversion filesystem has its data spread throughout various database tables in a fashion generally understood by (and of interest to) only the Subversion developers themselves. However, circumstances may arise that call for all, or some subset, of that data to be collected into a single, portable, flat file format. Subversion provides such a mechanism, implemented in a pair of svnadmin subcommands: dump and load.

The most common reason to dump and load a Subversion repository is due to changes in Subversion itself. As Subversion matures, there are times when certain changes made to the back-end database schema cause Subversion to be incompatible with previous versions of the repository. Other reasons for dumping and loading might be to migrate a Berkeley DB repository to a new OS or CPU architecture, or to switch between Berkeley DB and FSFS back-ends. The recommended course of action is relatively simple:

svnadmin dump will output a range of repository revisions that are formatted using Subversion's custom filesystem dump format. The dump format is printed to the standard output stream, while informative messages are printed to the standard error stream. This allows you to redirect the output stream to a file while watching the status output in your terminal window. For example:

$ svnlook youngest myrepos
26
$ svnadmin dump myrepos > dumpfile
* Dumped revision 0.
* Dumped revision 1.
* Dumped revision 2.
Б─╕
* Dumped revision 25.
* Dumped revision 26.

At the end of the process, you will have a single file (dumpfile in the previous example) that contains all the data stored in your repository in the requested range of revisions. Note that svnadmin dump is reading revision trees from the repository just like any other б╚readerб╩ process would (svn checkout, for example). So it's safe to run this command at any time.

The other subcommand in the pair, svnadmin load, parses the standard input stream as a Subversion repository dump file, and effectively replays those dumped revisions into the target repository for that operation. It also gives informative feedback, this time using the standard output stream:

$ svnadmin load newrepos < dumpfile
<<< Started new txn, based on original revision 1
     * adding path : A ... done.
     * adding path : A/B ... done.
     Б─╕
------- Committed new rev 1 (loaded from original rev 1) >>>

<<< Started new txn, based on original revision 2
     * editing path : A/mu ... done.
     * editing path : A/D/G/rho ... done.

------- Committed new rev 2 (loaded from original rev 2) >>>

Б─╕

<<< Started new txn, based on original revision 25
     * editing path : A/D/gamma ... done.

------- Committed new rev 25 (loaded from original rev 25) >>>

<<< Started new txn, based on original revision 26
     * adding path : A/Z/zeta ... done.
     * editing path : A/mu ... done.

------- Committed new rev 26 (loaded from original rev 26) >>>

The result of a load is new revisions added to a repositoryБ─■the same thing you get by making commits against that repository from a regular Subversion client. And just as in a commit, you can use hook scripts to perform actions before and after each of the commits made during a load process. By passing the --use-pre-commit-hook and --use-post-commit-hook options to svnadmin load, you can instruct Subversion to execute the pre-commit and post-commit hook scripts, respectively, for each loaded revision. You might use these, for example, to ensure that loaded revisions pass through the same validation steps that regular commits pass through. Of course, you should use these options with careБ─■if your post-commit hook sends emails to a mailing list for each new commit, you might not want to spew hundreds or thousands of commit emails in rapid succession at that list for each of the loaded revisions! You can read more about the use of hook scripts in б╚Hook Scriptsб╩.

Note that because svnadmin uses standard input and output streams for the repository dump and load process, people who are feeling especially saucy can try things like this (perhaps even using different versions of svnadmin on each side of the pipe):

$ svnadmin create newrepos
$ svnadmin dump myrepos | svnadmin load newrepos

By default, the dump file will be quite largeБ─■much larger than the repository itself. That's because every version of every file is expressed as a full text in the dump file. This is the fastest and simplest behavior, and nice if you're piping the dump data directly into some other process (such as a compression program, filtering program, or into a loading process). But if you're creating a dump file for longer-term storage, you'll likely want to save disk space by using the --deltas switch. With this option, successive revisions of files will be output as compressed, binary differencesБ─■just as file revisions are stored in a repository. This option is slower, but results in a dump file much closer in size to the original repository.

We mentioned previously that svnadmin dump outputs a range of revisions. Use the --revision option to specify a single revision to dump, or a range of revisions. If you omit this option, all the existing repository revisions will be dumped.

$ svnadmin dump myrepos --revision 23 > rev-23.dumpfile
$ svnadmin dump myrepos --revision 100:200 > revs-100-200.dumpfile

As Subversion dumps each new revision, it outputs only enough information to allow a future loader to re-create that revision based on the previous one. In other words, for any given revision in the dump file, only the items that were changed in that revision will appear in the dump. The only exception to this rule is the first revision that is dumped with the current svnadmin dump command.

By default, Subversion will not express the first dumped revision as merely differences to be applied to the previous revision. For one thing, there is no previous revision in the dump file! And secondly, Subversion cannot know the state of the repository into which the dump data will be loaded (if it ever, in fact, occurs). To ensure that the output of each execution of svnadmin dump is self-sufficient, the first dumped revision is by default a full representation of every directory, file, and property in that revision of the repository.

However, you can change this default behavior. If you add the --incremental option when you dump your repository, svnadmin will compare the first dumped revision against the previous revision in the repository, the same way it treats every other revision that gets dumped. It will then output the first revision exactly as it does the rest of the revisions in the dump rangeБ─■mentioning only the changes that occurred in that revision. The benefit of this is that you can create several small dump files that can be loaded in succession, instead of one large one, like so:

$ svnadmin dump myrepos --revision 0:1000 > dumpfile1
$ svnadmin dump myrepos --revision 1001:2000 --incremental > dumpfile2
$ svnadmin dump myrepos --revision 2001:3000 --incremental > dumpfile3

These dump files could be loaded into a new repository with the following command sequence:

$ svnadmin load newrepos < dumpfile1
$ svnadmin load newrepos < dumpfile2
$ svnadmin load newrepos < dumpfile3

Another neat trick you can perform with this --incremental option involves appending to an existing dump file a new range of dumped revisions. For example, you might have a post-commit hook that simply appends the repository dump of the single revision that triggered the hook. Or you might have a script that runs nightly to append dump file data for all the revisions that were added to the repository since the last time the script ran. Used like this, svnadmin's dump and load commands can be a valuable means by which to backup changes to your repository over time in case of a system crash or some other catastrophic event.

The dump format can also be used to merge the contents of several different repositories into a single repository. By using the --parent-dir option of svnadmin load, you can specify a new virtual root directory for the load process. That means if you have dump files for three repositories, say calc-dumpfile, cal-dumpfile, and ss-dumpfile, you can first create a new repository to hold them all:

$ svnadmin create /path/to/projects
$

Then, make new directories in the repository which will encapsulate the contents of each of the three previous repositories:

$ svn mkdir -m "Initial project roots" \
      file:///path/to/projects/calc \
      file:///path/to/projects/calendar \
      file:///path/to/projects/spreadsheet
Committed revision 1.
$

Lastly, load the individual dump files into their respective locations in the new repository:

$ svnadmin load /path/to/projects --parent-dir calc < calc-dumpfile
Б─╕
$ svnadmin load /path/to/projects --parent-dir calendar < cal-dumpfile
Б─╕
$ svnadmin load /path/to/projects --parent-dir spreadsheet < ss-dumpfile
Б─╕
$

We'll mention one final way to use the Subversion repository dump formatБ─■conversion from a different storage mechanism or version control system altogether. Because the dump file format is, for the most part, human-readable, ^[35] it should be relatively easy to describe generic sets of changesБ─■each of which should be treated as a new revisionБ─■using this file format. In fact, the cvs2svn utility (see б╚Converting a Repository from CVS to Subversionб╩) uses the dump format to represent the contents of a CVS repository so that those contents can be copied into a Subversion repository.

Despite numerous advances in technology since the birth of the modern computer, one thing unfortunately rings true with crystalline clarityБ─■sometimes, things go very, very awry. Power outages, network connectivity dropouts, corrupt RAM and crashed hard drives are but a taste of the evil that Fate is poised to unleash on even the most conscientious administrator. And so we arrive at a very important topicБ─■how to make backup copies of your repository data.

There are generally two types of backup methods available for Subversion repository administratorsБ─■incremental and full. We discussed in an earlier section of this chapter how to use svnadmin dump --incremental to perform an incremental backup (see б╚Migrating a Repositoryб╩). Essentially, the idea is to only backup at a given time the changes to the repository since the last time you made a backup.

A full backup of the repository is quite literally a duplication of the entire repository directory (which includes either Berkeley database or FSFS environment). Now, unless you temporarily disable all other access to your repository, simply doing a recursive directory copy runs the risk of generating a faulty backup, since someone might be currently writing to the database.

In the case of Berkeley DB, Sleepycat documents describe a certain order in which database files can be copied that will guarantee a valid backup copy. And a similar ordering exists for FSFS data. Better still, you don't have to implement these algorithms yourself, because the Subversion development team has already done so. The hot-backup.py script is found in the tools/backup/ directory of the Subversion source distribution. Given a repository path and a backup location, hot-backup.pyБ─■which is really just a more intelligent wrapper around the svnadmin hotcopy commandБ─■will perform the necessary steps for backing up your live repositoryБ─■without requiring that you bar public repository access at allБ─■and then will clean out the dead Berkeley log files from your live repository.

Even if you also have an incremental backup, you might want to run this program on a regular basis. For example, you might consider adding hot-backup.py to a program scheduler (such as cron on Unix systems). Or, if you prefer fine-grained backup solutions, you could have your post-commit hook script call hot-backup.py (see б╚Hook Scriptsб╩), which will then cause a new backup of your repository to occur with every new revision created. Simply add the following to the hooks/post-commit script in your live repository directory:

(cd /path/to/hook/scripts; ./hot-backup.py ${REPOS} /path/to/backups &)

The resulting backup is a fully functional Subversion repository, able to be dropped in as a replacement for your live repository should something go horribly wrong.

There are benefits to both types of backup methods. The easiest is by far the full backup, which will always result in a perfect working replica of your repository. This again means that should something bad happen to your live repository, you can restore from the backup with a simple recursive directory copy. Unfortunately, if you are maintaining multiple backups of your repository, these full copies will each eat up just as much disk space as your live repository.

Incremental backups using the repository dump format are excellent to have on hand if the database schema changes between successive versions of Subversion itself. Since a complete repository dump and load are generally required to upgrade your repository to the new schema, it's very convenient to already have half of that process (the dump part) finished. Unfortunately, the creation ofБ─■and restoration fromБ─■incremental backups takes longer, as each commit is effectively replayed into either the dump file or the repository.

In either backup scenario, repository administrators need to be aware of how modifications to unversioned revision properties affect their backups. Since these changes do not themselves generate new revisions, they will not trigger post-commit hooks, and may not even trigger the pre-revprop-change and post-revprop-change hooks. ^[36] And since you can change revision properties without respect to chronological orderБ─■you can change any revision's properties at any timeБ─■an incremental backup of the latest few revisions might not catch a property modification to a revision that was included as part of a previous backup.

Generally speaking, only the truly paranoid would need to backup their entire repository, say, every time a commit occurred. However, assuming that a given repository has some other redundancy mechanism in place with relatively fine granularity (like per-commit emails), a hot backup of the database might be something that a repository administrator would want to include as part of a system-wide nightly backup. For most repositories, archived commit emails alone provide sufficient redundancy as restoration sources, at least for the most recent few commits. But it's your dataБ─■protect it as much as you'd like.

Often, the best approach to repository backups is a diversified one. You can leverage combinations of full and incremental backups, plus archives of commit emails. The Subversion developers, for example, back up the Subversion source code repository after every new revision is created, and keep an archive of all the commit and property change notification emails. Your solution might be similar, but should be catered to your needs and that delicate balance of convenience with paranoia. And while all of this might not save your hardware from the iron fist of Fate, ^[37] it should certainly help you recover from those trying times.

While Subversion allows you to move around versioned files and directories without any loss of information, doing so can still disrupt the workflow of those who access the repository often and come to expect things to be at certain locations. Try to peer into the future a bit; plan ahead before placing your data under version control. By б╚laying outб╩ the contents of your repositories in an effective manner the first time, you can prevent a load of future headaches.

There are a few things to consider when setting up Subversion repositories. Let's assume that as repository administrator, you will be responsible for supporting the version control system for several projects. The first decision is whether to use a single repository for multiple projects, or to give each project its own repository, or some compromise of these two.

There are benefits to using a single repository for multiple projects, most obviously the lack of duplicated maintenance. A single repository means that there is one set of hook scripts, one thing to routinely backup, one thing to dump and load if Subversion releases an incompatible new version, and so on. Also, you can move data between projects easily, and without losing any historical versioning information.

The downside of using a single repository is that different projects may have different commit mailing lists or different authentication and authorization requirements. Also, remember that Subversion uses repository-global revision numbers. Some folks don't like the fact that even though no changes have been made to their project lately, the youngest revision number for the repository keeps climbing because other projects are actively adding new revisions.

A middle-ground approach can be taken, too. For example, projects can be grouped by how well they relate to each other. You might have a few repositories with a handful of projects in each repository. That way, projects that are likely to want to share data can do so easily, and as new revisions are added to the repository, at least the developers know that those new revisions are at least remotely related to everyone who uses that repository.

After deciding how to organize your projects with respect to repositories, you'll probably want to think about directory hierarchies in the repositories themselves. Because Subversion uses regular directory copies for branching and tagging (see п⌠п╩п╟п╡п╟б═4, п▓п╣я┌п╡п╩п╣п╫п╦п╣ п╦ я│п╩п╦я▐п╫п╦п╣), the Subversion community recommends that you choose a repository location for each project rootБ─■the б╚top-mostб╩ directory which contains data related to that projectБ─■and then create three subdirectories beneath that root: trunk, meaning the directory under which the main project development occurs; branches, which is a directory in which to create various named branches of the main development line; tags, which is a directory of branches that are created, and perhaps destroyed, but never changed. ^[38]

For example, your repository might look like:

/
   calc/
      trunk/
      tags/
      branches/
   calendar/
      trunk/
      tags/
      branches/
   spreadsheet/
      trunk/
      tags/
      branches/
   Б─╕

Note that it doesn't matter where in your repository each project root is. If you have only one project per repository, the logical place to put each project root is at the root of that project's respective repository. If you have multiple projects, you might want to arrange them in groups inside the repository, perhaps putting projects with similar goals or shared code in the same subdirectory, or maybe just grouping them alphabetically. Such an arrangement might look like:

/
   utils/
      calc/
         trunk/
         tags/
         branches/
      calendar/
         trunk/
         tags/
         branches/
      Б─╕
   office/
      spreadsheet/
         trunk/
         tags/
         branches/
      Б─╕

Lay out your repository in whatever way you see fit. Subversion does not expect or enforce a layout schemaБ─■in its eyes, a directory is a directory is a directory. Ultimately, you should choose the repository arrangement that meets the needs of the people who work on the projects that live there.

After deciding how to arrange the projects in your repository, you'll probably want to actually populate the repository with that layout and with initial project data. There are a couple of ways to do this in Subversion. You could use the svn mkdir command (see п⌠п╩п╟п╡п╟б═9, п÷п╬п╩п╫п╬п╣ я│п©я─п╟п╡п╬я┤п╫п╬п╣ я─я┐п╨п╬п╡п╬п╢я│я┌п╡п╬ п©п╬ Subversion) to create each directory in your skeletal repository layout, one-by-one. A quicker way to accomplish the same task is to use the svn import command (see б╚svn importб╩). By first creating the layout in a temporary location on your drive, you can import the whole layout tree into the repository in a single commit:

$ mkdir tmpdir
$ cd tmpdir
$ mkdir projectA
$ mkdir projectA/trunk
$ mkdir projectA/branches
$ mkdir projectA/tags
$ mkdir projectB
$ mkdir projectB/trunk
$ mkdir projectB/branches
$ mkdir projectB/tags
Б─╕
$ svn import . file:///path/to/repos --message "Initial repository layout"
Adding         projectA
Adding         projectA/trunk
Adding         projectA/branches
Adding         projectA/tags
Adding         projectB
Adding         projectB/trunk
Adding         projectB/branches
Adding         projectB/tags
Б─╕
Committed revision 1.
$ cd ..
$ rm -rf tmpdir
$

You can verify the results of the import by running the svn list command:

$ svn list --verbose file:///path/to/repos
      1 harry               May 08 21:48 projectA/
      1 harry               May 08 21:48 projectB/
Б─╕
$

Once you have your skeletal layout in place, you can begin importing actual project data into your repository, if any such data exists yet. Once again, there are several ways to do this. You could use the svn import command. You could checkout a working copy from your new repository, move and arrange project data inside the working copy, and use the svn add and svn commit commands. But once we start talking about such things, we're no longer discussing repository administration. If you aren't already familiar with the svn client program, see п⌠п╩п╟п╡п╟б═2, п╜п╨я│п╨я┐я─я│п╦я▐ п©п╬ Subversion.