[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re:
From: |
Derek R. Price |
Subject: |
Re: |
Date: |
Fri, 15 Dec 2000 19:55:13 -0500 |
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:dprice@openavenue.com 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:joshb@cct104.Cadence.COM]
> >Sent: Friday, December 15, 2000 11:23 AM
> >To: bug-cvs@gnu.org
> >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...
>
> _______________________________________________
> Bug-cvs mailing list
> Bug-cvs@gnu.org
> http://mail.gnu.org/mailman/listinfo/bug-cvs
- (no subject), Asa Paschall, 2000/12/08
- (no subject), Josh Baudhuin, 2000/12/15
- RE:, Josh Baudhuin, 2000/12/15
- Re:,
Derek R. Price <=
- Re:, Derek R. Price, 2000/12/15