[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Accessing files removed from the trunk
From: |
Matthew Rich |
Subject: |
Re: Accessing files removed from the trunk |
Date: |
Fri, 6 Jan 2006 14:24:10 -0800 (PST) |
Great. I have verified that if I checkout using the
branch tag I am missing the files if I use a tag made
on the branch prior to the removal if the file I get
the files. Man this can get confusing. Looks like
I'm okay. Howerver I need to provide more instruction
on not removing files before I know about it and to be
sure just where the files are to be removed from.
Thanks everyone!
--- "Mark D. Baushke" <address@hidden> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Larry Jones <address@hidden> writes:
>
> > Mark D. Baushke writes:
> > >
> > > Matthew Rich <address@hidden> writes:
> > >
> > > > Okay I finially got more info. Turns out I
> was right
> > > > but the developer also removed the files from
> the
> > > > branch by mistake. So if the files are
> removed from
> > > > the branch are all the tags that refered to
> thoses
> > > > files lost? I hope not.
> > >
> > > No, the branch tags should still be there.
> >
> > Unfortunately not -- the way you remove a file
> from a branch is by
> > removing the branch tag from the file.
>
> For very old versions of cvs (before cvs 1.6), Larry
> is correct.
>
> For recent versions of cvs 1.11.x or cvs 1.12.x, he
> is not remembering
> correctly.
>
> > You should consider restoring your repository (or
> at least the files in
> > question) from a backup made before the incorrect
> deletions.
>
> This should not be necessary in this instance.
>
> CVS was changed to avoid just removing branch tags
> when the 'dead' state
> was introduced to CVS a very long time ago (sometime
> in 1995?).
>
> Enjoy!
> -- Mark
>
> Example using the oldest cvs I had laying around
> anywhere...
>
> bash-3.00$ cvs add foo
> Directory /tmp/mdb.repos/foo added to the repository
> 163:bash-3.00$ cd foo
> bash-3.00$ touch a
> bash-3.00$ cvs add a
> cvs add: scheduling file `a' for addition
> cvs add: use 'cvs commit' to add this file
> permanently
> bash-3.00$ ls
> a CVS/
> bash-3.00$ cvs ci -m new a
> RCS file: /tmp/mdb.repos/foo/a,v
> done
> Checking in a;
> /tmp/mdb.repos/foo/a,v <-- a
> initial revision: 1.1
> done
> bash-3.00$ cvs tag -b branch-name a
> T a
> bash-3.00$ cvs up -r branch-name
> cvs update: Updating .
> bash-3.00$ cvs rm -f a
> cvs remove: scheduling `a' for removal
> cvs remove: use 'cvs commit' to remove this file
> permanently
> bash-3.00$ cvs ci -mnukeit a
> Removing a;
> /tmp/mdb.repos/foo/a,v <-- a
> new revision: delete; previous revision: 1.1
> done
> bash-3.00$ cvs log a
>
> RCS file: /tmp/mdb.repos/foo/a,v
> Working file: a
> head: 1.1
> branch:
> locks: strict
> access list:
> symbolic names:
> branch-name: 1.1.0.2
> keyword substitution: kv
> total revisions: 2; selected revisions: 2
> description:
> - ----------------------------
> revision 1.1
> date: 2006/01/06 22:03:26; author: mdb; state:
> Exp;
> branches: 1.1.2;
> new
> - ----------------------------
> revision 1.1.2.1
> date: 2006/01/06 22:03:54; author: mdb; state:
> dead; lines: +0 -0
> nukeit
>
=============================================================================
> bash-3.00$ cvs -v
>
> Concurrent Versions System (CVS) 1.11.18
> (client/server)
>
> Copyright (c) 1989-2004 Brian Berliner, david d
> `zoo' zuhn,
> Jeff Polk, and other authors
>
> CVS may be copied only under the terms of the GNU
> General Public License,
> a copy of which can be found with the CVS
> distribution kit.
>
> Specify the --help option for further information
> about CVS
> bash-3.00$
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.3 (FreeBSD)
>
>
iD8DBQFDvuuwCg7APGsDnFERAjFCAJ44ZyApPXnN4BCKhig4D5R9NV9V6wCgwVBz
> eVpakdRiUM7/rBKSozhKczA=
> =BWmc
> -----END PGP SIGNATURE-----
>