Re: cvs question

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Doug Barton wrote:
Aryeh M. Friedman wrote:
I maintain a local repo of the via the cvs mode of cvsup. When I
do a:

What command did you use to check out the files, and what tree are
you talking about?

cvsup -h cvsup9.us.freebsd.org /usr/share/examples/cvsup/cvs-supfile
cd /usr/src
cvs -q -d /home/ncvs update
cd /usr/ports
cvs -q -d /home/ncvs update

The problem showed up specifically when the above failed to add
src/sys/dev/sf/* but the makefiles where updated to ref it.

cvs -q -d /home/ncvs update

It will update any modified files but will not add any new files

When you say "new files" do you really mean new directories? If a
new directory is added to the tree, you need to use 'update -d' to
get it in your working copy. Otherwise cvs will add new files in
existing directories by default, so if that's not happening for you,
something is wrong.

Someone one else suggested adding the -d and it seems to work fine.

(it
removes stale ones), but if I do a checkout it overwrites my local
modifications...

If that is actually happening, you've done something really wrong,
since that is not what cvs does by default.

Here goes the entire setup procedure I used (it is the very first
thing I did on the machine after installing the base system [from dist
cd]):

pkg_add -r cvsup-without-gui
mkdir /home/ncvs
cvsup -h cvsup9.us.freebsd.org /usr/share/examples/cvsup/cvs-supfile
cd /usr
cvs -q -d /home/ncvs checkout src ports doc www
pkg_delete cvsup-without-gui (I later re-add as a port not as a
package)

I would suggest that you go into your working copy (checked out
tree) and do 'cvs diff -u > ~/mytree.diff' and then wipe out what
you had and check it out again. Then you can apply your diff as needed.

You should also spend some time thoroughly reading the cvs man page.
It's a fairly complex system, and it's easy to accidentally add a
knob that will have hard to diagnose long-term effects.

Doug


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHlQIdQi2hk2LEXBARAjfhAKCMj+XNILXAI+KuV62qf7N0slFGIQCeOl6+
XnUFkDi9kyVc/cFxbE9TvpY=
=eSyb
-----END PGP SIGNATURE-----

_______________________________________________
freebsd-hackers@xxxxxxxxxxx mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@xxxxxxxxxxx"

Relevant Pages

  • Re: [OT] Q: what would you choose for a VCS today
    ... CVS repository before they let you start doing any work in the newly ... You can keep 'importing' snapshots of the src tree from any ... This is how we 'resync' with the official doc/ tree changes in the Greek ... The whole process of importing clean snapshots is automated in a shell ...
    (freebsd-hackers)
  • maintaining DRM and using bitkeeper..
    ... The biggest problem we are facing with the DRM is getting things tested ... the -mm tree is more useful for picking out non-x86 ... At the moment I put patches into the BK CVS first, we stabilise them, I ... take the CVS changes and patch them into bitkeeper, Andrew picks them up, ...
    (Linux-Kernel)
  • Re: 2.6.3-mm4
    ... I think all you need to do is get the cvs tree of the ... Sensors people, ... > I will apply the libsensors changes to the CVS repository as soon as the ...
    (Linux-Kernel)
  • Re: 2.6.7-vanilla-SMP kernel: pagebuf_get: failed to lookup pages
    ... much time the sgi people have before then. ... > checked in CVS code for use on a 'stable' machine is bordering on my ... FWIW, the CVS tree isn't freshly checked in, it's a reflection of the ... send the line "unsubscribe linux-kernel" in ...
    (Linux-Kernel)
  • Re: Which versioning system is the simplest to use??
    ... I now use CVS to maintain version control of the configuration files on my ... Whenever I want to change a configuration file in the "live" tree, ... SVN is supposed to be a "better CVS", ... SVN is considerably more complex to install and manage than CVS, ...
    (freebsd-questions)