Re: Please HElP. A developer has removed/commit files from Integration Branch!!!

[Jim Hyslop]

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

Farshad Mahjoubi wrote:
> A developer has removed/commited numbers of files in one Integration Branch.
> 
>  
> 
> The files/dirs are still in the Trunk, how can I get these dir/files back
> into the Integration Branch now?

The commands you want are:

cvs update -r your_branch
cvs update -j your_branch -j THE_TAG (list-of-files-removed)
cvs commit -m "Restoring files that developer removed"


Now, what is "THE_TAG"?

1) If you want to restore the files exactly as they appeared immediately
before the developer removed them, then:
  a) if the developer applied a tag before removing them, then use that tag
  b) otherwise, THE_TAG is the numeric revision for each file you want
to restore, and you will have to issue one 'update -j-j' command for
each file.

2) Otherwise, if it is acceptable to copy the files from the trunk, then
THE_TAG is "HEAD".

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDlydvLdDyDwyJw+MRAs8hAKDhu0lKiU63MNbCMLUdNbsL7vLpSwCgg2q6
zZqqi2Dx9tU/7/zaPKFUOY8=
=4ZKN
-----END PGP SIGNATURE-----