bug-cvs
[Top][All Lists]
Advanced

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

Re:


From: Derek R. Price
Subject: Re:
Date: Fri, 15 Dec 2000 20:23:09 -0500

Nevermind, I think I managed.  Added and removed files can't pick up sticky 
keywords.  I think at least part of the trick here is that an added file has
never been checked out, so it's never had keywords subbed anyhow and no merge 
could have been attempted, so why do you care?

I'm not quite sure this is a bug.  It may qualify as an enhancement if anybody 
wanted to work on it since it is debatable that if you set -kk for all the
files in your repository, you probably want to keep it for added files too, the 
same way tag information is propogated..

I couldn't get the missing sticky keywords to cascade unless the files in 
subdirectories were also newly added.

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
73. ASCII a stupid question, get a stupid ANSI!

"Derek R. Price" wrote:

> I couldn't reproduce this.  I even tried multiple roots.  Can you get it down 
> to a sanity.sh test case?
>
> Derek
>
> --
> Derek Price                      CVS Solutions Architect ( http://CVSHome.org 
> )
> mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
> --
> 106. I want to die peacefully, in my sleep, like my grandfather,
>      not screaming, terrified, like his passengers.
>
> Josh Baudhuin wrote:
>
> > Woops. I forgot to add:
> >
> > >Fix:
> >
> > I haven't had time to look into this. Here are a couple of things 
> > noteworthy about the directory in question, either one which may have some 
> > impact...
> >
> > 1) The directory which didn't take the sticky -kk had an additional file 
> > and a removed file as a result of the merge, e.g.:
> >         A .cvsignore
> >         M afile.cpp
> >         R drawdb.cc
> >            .
> >            .
> >            .
> >         M zfile.cpp
> >
> > 2) The additional file was a  .cvsignore  file containing a handful of 
> > specific files (no wildcards).
> >
> > >-----Original Message-----
> > >From: Josh Baudhuin [mailto:address@hidden
> > >Sent: Friday, December 15, 2000 11:23 AM
> > >To: address@hidden
> > >Subject:
> >
> > >Submitter-Id:   net
> > >Originator:     Josh Baudhuin
> > >Organization:
> > net
> > >Confidential:  yes
> > >Synopsis:      update -kk across multiple dirs drops -kk after a few dirs
> > >Severity:      non-critical
> > >Priority:      medium
> > >Category:      cvs
> > >Class:         sw-bug
> > >Release:       cvs-1.11
> > >Environment:
> >
> > System: SunOS cct104 5.7 Generic_106541-07 sun4u sparc SUNW,Ultra-80
> > Architecture: sun4
> >
> > >Description:
> >
> >
> >  * I have a directory hierarchy foo/src/{adir,bdir,cdir,...} under cvs
> > control. (There are 65 subdirs underneath foo/src.)
> >
> >  * The archive files have a main trunk and a branch, with a
> > "last-merge" label applied on revisions in the branch.
> >
> >  * The files are generally -kkv, with the occasional -kb (the
> > latter kept sticky through use of the CVSROOT/wrappers controls).
> >
> > 1) I recently tried to do an incremental merge en masse:
> >
> >         % cd foo/src
> >         % cvs update -jBRANCH-last-merge -jBRANCH -kk
> >
> > 2) While dealing with the merge-conflicts, I noticed that at about the
> > 8th subdirectory, the -kk sticky option was no longer being applied!
> >    Those files appear to have been updated -kk (i.e., no keyword
> > expansion). When I examined the CVS/Entries files in subdirs
> > {a,b,c,d,e,f,g}dir/, the .../-kk/ is there, but once I hit  hdir/  the
> > update commandline option -kk was no longer being stuck. None of the
> > subsequent subdirectories had the -kk either.
> >    (As indicated in the Cederkvist manual, using -kk is useful to
> > avoid spurious, keyword-related merge conflicts. If the option isn't
> > entered into the Entries file--i.e., not sticky--spurious differences
> > is exactly what you get, which makes the conflict resolution painful.)
> >
> > >How-To-Repeat:
> >
> >
> > I haven't had time to look into this. Here are a couple of things
> > noteworthy about the directory in question, either one which may have
> > some impact...
> >
> > >Fix:
> >
> >
> > By way of workaround, I wasn't able address the problem for the
> > above-noted directory, but I split the update invokations thus:
> >
> >         % foreach dir (^*CVS)   # ^*CVS is a tcsh-ism for all-but-"CVS"
> >         ? cvs update -jBRANCH-last-merge -jBRANCH -kk $dir
> >         ? end
> >
> > The said directory still did not have sticky -kk, but the prior and
> > subsequent ones did have the sticky option. I didn't attempt to edit
> > the Entries file manually (to stick -kk in it) for the offending
> > directory.
> >
> > Hope this all makes sense...




reply via email to

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