On Thu, 27 Sep 2012, Ed Flecko wrote:
Thank you all!
I'm a little confused by Trond's reply,
"Make sure your /usr/src and /usr/ports directories does not contain
files and directories served by Subversion, they will hinder
extraction/updating when checking out a Subversion working copy on top
of the existing hierarchy.
Simply delete all non-local files, rename /usr/src/sys to, say
/usr/src/sys0, do the Subversion check out, and move your local files
back into place."
1.) What is meant by deleting all non-local files? What files is he
referring to?
If you have made any local changes to files in /usr/src or /usr/ports,
those changes will conflict with the versions svn will bring in.
2.) If I rename /usr/src/sys to, say /usr/src/sys0, do the Subversion
check out, and move your local files back into place, won't that be
replacing new files with the older files?
Yes, although svn will only care if those files differ from the files in
the repository. Most people won't have any local changes anyway.
3.) These steps are just meant for the initial check out, aren't
they??? Once I've checked out (i.e., "downloaded", right?) the current
files, I'll only need to: svn update /usr/ports..., etc. from that
point forward and not "delete all non-local files, rename /usr/src/sys
to, say /usr/src/sys0, do the Subversion check out, and move your
local files back into place"...Is that right?
Yes. If a new version of a file conflicts with your local changes, svn
will complain and try to help resolve those conflicts.
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "[email protected]"
