Re: repository status and recovered files

[Mark D. Baushke]

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

Timothy Stone <address@hidden> writes:

> 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'.

Sure and now the file is on the RB2_0 branch, but not yet on the
mainline. You will probably wish to perform the same operation on the
mainline if you want the file to be visible there as well.

> 
> 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 %

It looks fine to me.

> 
> So, note how the "Repository revision" is noted as in the "Attic". Can
> anyone elaborate what is going on here? 

If you checkout the mainline, the pebble.jpg file will not be present as
you have not committed a version of the file to the main line to cause
it to be moved from the Attic.

If you checkout the RB2_0 branch, the pebble.jpg file will be present.

> Shouldn't the file now be on the branch and not in the Attic following
> recovery?

Not unless you also recover the file on the mainline.

> Many thanks in advance,
> Tim

        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFBH4kz3x41pRYZE/gRAtAyAKDFFf0WNshj70CSjTu8HrMtMYtUMwCg1aSM
PjZFmuha7H+D2Cjxu78XKA0=
=39ib
-----END PGP SIGNATURE-----