SVN commit 8654 by avilla: - Make kdemerge and co. Subversion friendly.
There are mainly two differences with the CVS version: * sparse checkouts are a lot slower; * since Subversion allows for `svn cp` and `svn mv`, the -w option in kdemerge is now strongly suggested. The -w option will drop you (developer) into a shell right before merging area51 to the checked out ports tree (it only works along with -c), to let you proceed with `svn cp` and `svn mv` wherever needed (please, use them when possible, e.g., with renamed files and patches, moved or duplicated ports, etc.). For instance: $ kdemerge -ckmw /tmp ... (you're dropped into a shell) $ cd /tmp/ports/devel $ svn mv kdebindings4-python-pykde4 py-pykde4 ... $ ^D (the shell quits and kdemerge goes on) ... Of course, when preparing a patch for an exp-run, `svn cp` and `svn mv` should not be used, as the resulting patch would not apply on a tree unless the same commands have been run; i.e., for en exp-run, py-pykde4 will appear as a completely new port, instead of being the renamed kdebindings4-python-pykde4. M +97 -124 area51 _______________________________________________ kde-freebsd mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
