info-cvs
[Top][All Lists]
Advanced

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

Re: Maintaining branches...


From: Mark
Subject: Re: Maintaining branches...
Date: Mon, 18 Jun 2001 10:02:56 -0700 (PDT)

--- Paul Sander <address@hidden> wrote:
> Just a couple of brief comments...
> 
> >--- Forwarded mail from address@hidden

> >cvs update command:
> >    * -A would have to check for locally stored merge info for the
> >file and remove it before updating
> 
> Note that -r should do the same.
> 
> >    * without options, same as co without options
> >    * without options, cvs update on a merged working copy needs to
> >update the merge info in the working dir's CVS subdirectory for the
> >file.
> >    * -j would have to record merge info locally, also would have
> >to deal with multiple -j calls on the same file.

Accually (it was brought to my attention) that the -A option should update
local merge info. So, the -A and -r options should account for the merge that
-A or -r performed.

Using merge math as this thread was disscussing, that resultant merge may
negate the merge, in that case the local merge info would be removed.

Mark

__________________________________________________
Do You Yahoo!?
Spot the hottest trends in music, movies, and more.
http://buzz.yahoo.com/



reply via email to

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