svk Upgrading your development from svn to svk and svl #11

Vendor branch in svk

% tar xfz Acme-Colour-1.00.tar.gz -C /tmp
% svk import -m "import 1.00" //vendor/acme-colour /tmp/Acme-Colour-1.00
% svk cp -m "take acme-colour 1.00" //vendor/acme-colour //project/src/acme-colour

% svk co //project
# hack hack hack
% tar xfz Acme-Colour-1.02.tar.gz -C /tmp
% svk import -m "import 1.02" //vendor/acme-colour /tmp/Acme-Colour-1.02
% svk pull //project/src/acme-colour # vendor merge

You will see how conflict resolution works later

Copyright © 2005 Catalyst IT Ltd.