[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Removing Changes
From: |
Mark D. Baushke |
Subject: |
Re: Removing Changes |
Date: |
Mon, 25 Aug 2003 12:00:20 -0700 |
Mischke, MaryBeth <address@hidden> writes:
> I've seen information about how to revert back to a previous revision of a
> file in the documentation, but how is the best way to pull a change out that
> is in the middle of other revisions you want to keep? For example the
> current file revision is 1.4, unwanted change is 1.2, but I do want the
> changes in 1.3. Is there any fancy update command that will work that out
> for me?
Yes, use the command:
cvs up -j1.2 -j1.1 filename
to merge into your working copy of the file a version that tries to remove
the change introduced by version 1.2. You will still need to resolve any
conflicts.
...
> 2. CONFIDENTIALITY NOTICE - This e-mail transmission, and any
> documents, files or previous e-mail messages attached to it may
> contain information that is confidential or legally privileged. If
> you are not the intended recipient, or a person responsible for
> delivering it to the intended recipient, you are hereby notified
> that you must not read this transmission and that any disclosure,
> copying, printing, distribution or use of any of the information
> contained in or attached to this transmission is STRICTLY
> PROHIBITED. If you have received this transmission in error, please
> immediately notify the sender by telephone or return e-mail and
> delete the original transmission and its attachments without
> reading or saving in any manner. Thank you
The above notice is in poor taste went sent to a public mailing list. I
suggest you consider asking your postmaster to read
http://www.goldmark.org/jeff/stupid-disclaimers/
as well as see what has been said on the info-cvs list in the past:
http://mail.gnu.org/archive/html/info-cvs/2003-06/msg00224.html
concerning this topic.
-- Mark