[Top][All Lists]

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

RE: commiting all changes

From: Nicholas Catanchin
Subject: RE: commiting all changes
Date: Thu, 20 Dec 2001 13:10:54 +1000

Maybe I don't fully understand your question, but such a command is
available and what you are trying to do is possible. Try this:

cvs import -m "Import of project, older version" module project_name
cvs import -m "Import of project, newer version" module project_name

Replace module, project_name and older/newer_revision with your own

You might get conflicts on the second import, but - whether it conflicts
or not - you need to merge the two revisions together using:

cvs co -jolder_revision -jnewer_revision (-ko) module

That command merges differences between the older and newer revision -
adding and removing files as required. Once the merge is complete you
need to fix any conflicts and commit the changes. The '-ko' parameter
turns off keyword expansion. This gets rid of conflicts resulting from
keywords expanding differently for different revisions and also stops
your binary files from getting corrupted.

I hope that helps and that I am not way off - I only just learnt this
stuff myself.
Good luck.

Nicholas Catanchin
Riders Cyclery
579 Kessels Road, Macgregor QLD 4109
Phone: (07) 3849 5333

-----Original Message-----
From: address@hidden [mailto:address@hidden On Behalf
Of address@hidden
Sent: Thursday, 20 December 2001 12:14 PM
To: address@hidden
Subject: Q: commiting all changes

Frequently I find myself with two version of a project, say one a few
months newer than the other, that I would like to move into CVS. I would
like to import the first one, then the second one as a revision. The
only way I know how to do this is to copy over the new files, go through
and find all the files that have been added and run 'cvs add' on each
one, find all the deleted files and run 'cvs remove' on each of them.
Then commit.

Why couldn't there be a single command that would find _all_ the
differences in the code tree and commit them? Is this considered too

-Adam Thomas

Info-cvs mailing list

reply via email to

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