info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

repository status and recovered files


From: Timothy Stone
Subject: repository status and recovered files
Date: Sun, 15 Aug 2004 10:33:44 -0400

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

List,

So I had the need to recover a deleted file from an experimental branch I had started and then merged with the mainline.

I had released the experimental branch following the merge, happy with the results. Since the experimental branch had been merged with the mainline, the deleted file was properly reflected. I then branched a new line of development ( rtag -b RB2_0 ). Upon noticing the file was needed I followed the manual and updated using
    `update -j[deleted version] -j[previous version] image.jpg'.

This recovered the file. But I wanted to understand a little more about the repository status of the file as noted in `status image.jpg'.

sandbox % cvs status image.jpg
===================================================================
File: image.jpg        Status: Up-to-date

   Working revision:    1.1.4.1 Sun Aug 15 02:28:57 2004
Repository revision: 1.1.4.1 /usr/local/cvsroot/wwwroot/common/images/Attic/pebble.jpg,v
   Sticky Tag:          RB2_0 (branch: 1.1.4)
   Sticky Date:         (none)
   Sticky Options:      -kb

sandbox %

So, note how the "Repository revision" is noted as in the "Attic". Can anyone elaborate what is going on here? Shouldn't the file now be on the branch and not in the Attic following recovery?

Many thanks in advance,
Tim
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFBH3RMlNb2aYI3YNkRAtsyAKCOvrFypHIu8R4VIyx3rka/5t7mRACfekT4
yfrUtyhJAAPodTO/TAXj76g=
=aamy
-----END PGP SIGNATURE-----





reply via email to

[Prev in Thread] Current Thread [Next in Thread]