info-cvs
[Top][All Lists]
Advanced

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

RE: CVS Import


From: Rajesh Patwardhan
Subject: RE: CVS Import
Date: Mon, 16 Jul 2001 15:57:04 -0400

Hi,
( Back ground : There were 3 versions of a s/w module ready and were recursively imported into CVS )

With reference to the import I noticed that during the import

cvs failed or did not intentionally do a import of a directory which had *.gif files in it completely. this directory also had some other source file in different subdirectory of this dir.

which were also not imported into the repository.

Now

1) Do I do a import of the 3 versions for this directory ?
if this is indeed to be imported then what would happen for the nonmergeable *.gif files.

2) or do i checkout the source for each version (with a sticky tag) and add the directory with the *.gif (and also some other source files).

3) Also since we are on this subject
could someone also explain diff between various versions created during import such as

a) version created with the vendorname.

b) version with the releasetag.

Thank you very much in advance.
Regards,
Rajesh

-----Original Message-----
From: address@hidden [mailto:address@hidden]
Sent: Monday, July 09, 2001 12:37 PM
To: address@hidden
Cc: address@hidden
Subject: Re: CVS Import


Rajesh Patwardhan writes:
>
> I use
> cvs import -m "Message" dir_to_import_on_cvs_repo vendor_tag release_tag_1
>
> The first import was good. There was no problem at all.
>
> 2) Now I do a import for the second source with
> cvs import -m "Message" dir_to_import_on_cvs vendor_tag release_tag_2
> This import also shows no errors.

It is a good idea at this point to do a merge checkout to detect any
files that were deleted between the two releases:

        cvs co -jrelease_tag_1 -jrelease_tag_2 dir_to_import_on_cvs
        cd dir_to_import_on_cvs
        cvs commit -m'merge'

> I do a cvs checkout in to another directory and in the status \ log do not
> see the versions as they should be seen or at least I think how they should
> be.
>
> i.e.: version with release_tag_1
> i.e.: version with release_tag_2
> I would expect a working revision of 1.1.1.2

If the file is exactly the same in both releases, CVS doesn't bother to
create a new revision, it just applies the new release tag to the
existing revision.

-Larry Jones

...That would be pretty cool, if they weren't out to kill me. -- Calvin


reply via email to

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