[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: undoing a commit after other changes have been made
From: |
Dennis Jones |
Subject: |
Re: undoing a commit after other changes have been made |
Date: |
Tue, 12 Jun 2007 16:19:57 GMT |
"Spiro Trikaliotis" <address@hidden> wrote in message
news:address@hidden
>> For example: if I found that this fix-pack was the only change made on
>> the 20th, then I'd do something
>> cvs co mymodule ; cd mymodule
>> cvs merge -j 20070120 -j 20070119
>
> The only thing: cvs does not know merge. Additionally, you cannot use
> dates in -j operation.
Generally speaking, you are correct. However, I recently discovered in
Cedarqvist (v1.11), section A.16.2, that dates *can optionally* be used with
the -j switch *if* the tag being referenced refers to a branch. I did a
simple test of this the other day when replying to a question about merging
with dates last week (see: "Merging using a date"), and it worked.
Of course, as you said, a better solution (which works whether or not you're
on a branch) is to create tags based on the required dates, and then use
those tags in the merge operation.
- Dennis