[Top][All Lists]

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

Re: update -j BASE -j MYTAG bug

From: Larry Jones
Subject: Re: update -j BASE -j MYTAG bug
Date: Tue, 16 Sep 2003 11:21:17 -0400 (EDT)

Frank Hemer writes:
> Running the above mentioned command ( 'cvs -z5 update -jBASE -jTEST_TAG' ), I 
> expected my current sandbox being reverted to the state of MYTAG, still 
> keeping my current modifications.
> Instead, the affected files were updated to the HEAD.

This is a bug in CVS: update doesn't recognize the special tag BASE. 
Even if it did, your command wouldn't do what you expect.  Update always
performs its normal function, even when merging, so your files *should*
be updated to the HEAD.  The problem is that that happens *before* the
merge tags are evaluated, so by the time the merge happens, BASE would
refer to the HEAD revision rather than the revision you started out

A simple workaround is to apply a temporary tag first and then use that
tag in the merge rather than BASE.

-Larry Jones

Why is it you always rip your pants on the day everyone has to
demonstrate a math problem at the chalkboard? -- Calvin

reply via email to

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