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: Tue, 19 Dec 2000 10:29:05 -0500

No, really.  I couldn't get that to happen either.  Not with the development 
version of CVS anyhow.  My sticky keywords cascade just fine.  It's only the 
files that were actually added/removed that seem to miss getting the '-kk' 
sticky attached.  Can you write a sanity.sh test case?  Perhaps upgrade to the 
current dev version first?  There's a Linux & a source RPM at:

    http://alumni.engin.umich.edu/~oberon/cvs-1.11.0.1-0_cvshome_org_4.i386.rpm
    http://alumni.engin.umich.edu/~oberon/cvs-1.11.0.1-0_cvshome_org_4.src.rpm

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
OPHELIA
  O, what a noble mind is here o'erthrown!
  The courtier's, soldier's, scholar's, eye, tongue, sword,
  Th'expectancy and rose of the fair state,
  The glass of fashion and the mould of form,
  Th'observed of all observers, quite, quite down!
  And I, of ladies most deject and wretched,
  That sucked the honey of his music vows,
  Now see that noble and most sovereign reason
  Like sweet bells jangled, out of time and harsh,
  That unmatched form and feature of blown youth
  Blasted with ecstasy.  O, woe is me
  T'have seen what I have seen, see what I see!

     - Hamlet, Act III, Scene 1, Lines 151-162

Josh Baudhuin wrote:

> Thanks for taking a look at this.
>
> The problem as I see it is that the goal of sticking the -kk option onto the 
> files gets lost once cvs encounters the added/removed file(s). So for the 
> particular directory, the added file .cvsignore caused all of the rest of the 
> files in the directory not to get stuck with -kk (even though they were 
> actually update/merge'd -kk). And in the broader case (multiple 
> subdirectories), the subsequent directories got the same mistreatment, where 
> -kk didn't stick.
>
> Seems like a bug, though possibly not an easy-to-encounter one. In my case, 
> the added/removed file came through with the merge (one was added, the other 
> removed, in the branch, and then when I tried to merge to the main trunk, 
> voila). The workaround I guess is to get those added/removed files out of the 
> way somehow (merge them separately first, and advance the "last-merged" 
> label) before doing the merge en masse. In my case, I had a few weeks' 
> backlog of changes accumulated.
>
> Gosh, what a zany mail client I have: from the looks of it you work at the 
> same company as me. ;-)
>
> --Josh
>
> -----Original Message-----
> From: address@hidden [mailto:address@hidden Behalf Of Derek
> R. Price
> Sent: Friday, December 15, 2000 5:23 PM
> To: Josh Baudhuin; address@hidden
> Subject: Re:
>
> 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]