[Top][All Lists]

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

Re: Removing revisions

From: Greg
Subject: Re: Removing revisions
Date: Mon, 03 Apr 2006 18:04:36 GMT
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.0.2) Gecko/20021120 Netscape/7.01

Larry Jones wrote:
Greg writes:

The problem is that now I want that locally modified revision to be committed, and in fact no longer need/want any of the changes done for the current committed revision ( So basically I want the locally modified to become, with none of the additions of - merged (or to delete, and make the locally modified the new I hope that makes sense...

The right way to have done that would have been to check out the tip of
the branch (, used update to remove the unwanted changes ("cvs
up -j -j file"), make your changes, and then commit. Since you didn't do that, the most expedient thing to do is to
temporarily rename your version of the file to something else, use "cvs
update -r branch file" to get the most recent version of the file on the
branch, replace that with your save version, then commit.

-Larry Jones

I don't NEED to compromise my principles, because they don't have
the slightest bearing on what happens to me anyway. -- Calvin

Aha...yes, I see now and will remember that. Thanks to you and Arthur for the responses

reply via email to

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