Re: removing global from tree

2000-10-15 Thread Gerhard Sittig

On Sat, Oct 14, 2000 at 16:07 -0700, David O'Brien wrote:
> 
> [ ... reviving cvs rm'ed files ... ]
> 
> As you've just shown, this can be a real PITA.
> 
> > But I feel that David wants to know this, too.
> 
> Huh?  Do what??  I fully understand how to remove, add, and
> revive files in the repo.

Hey, sorry!  I didn't want to step on anybody's toes here.  I
didn't want to teach others their daily work they already do in a
routinely fashion.  It was me who had problems in understanding
what the manual intervention (or the feeling to have to do some)
came from.  That's when I wanted to learn about it.

In case it's needed, I apologize.  Let's end this thread.  I got
that I was overlooking the real point and thought "moving
something into the Attic" is completely different from what I
thought it is.  Don't take my ignorance or slowliness as an
affront ...


virtually yours   82D1 9B9C 01DC 4FB4 D7B4  61BE 3F49 4F77 72DE DA76
Gerhard Sittig   true | mail -s "get gpg key" [EMAIL PROTECTED]
-- 
 If you don't understand or are scared by any of the above
 ask your parents or an adult to help you.


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



Re: removing global from tree

2000-10-14 Thread John Baldwin


On 14-Oct-00 Gerhard Sittig wrote:
> On Sat, Oct 14, 2000 at 11:16 -0700, John Baldwin wrote:
>> 
>> On 14-Oct-00 Gerhard Sittig wrote:
>> > 
>> > Up to now I always thought "the Attic" is something CVS
>> > itself takes care of when "cvs rm"ing files.  What's that
>> > special thing needing manual intervention or special
>> > attention you've been talking about lately?  Is it for
>> > performance reasons or for the warm fuzzy feelings of having
>> > "not too rotten a repo"?
>> 
>> It is where CVS puts files when you cvs rm them.  You just have
>> to do the actual cvs rm/cvs ci.  David was cautious because if
>> he had to back the change out, he didn't want to have to try to
>> cvs add all of the files back in.
> 
> Isn't it true that all the "log", "diff", "up -r" and such
> commands still work in the expected way?  That's the reason for
> having "the Attic", I thought.  Not to remove the repo file when
> the working file expires, but to keep the history and to restore
> any previous revision thereof when requested.  Backing out an
> rm'ed file should be as difficult as doing the sequence I just
> tested to make sure:

Yes.  The trick is getting the list of files you just deleted,
esp. when you are taking out several directories of stuff.  David's
point was to not make the task overly difficult, but instead to
simply do teh Makefile change first, to make the change easier to
revert if necessary, as it would then only require one edit and commit,
rather than having to generate a list of files to re-add and commit
as well.  Geez, he knows how CVS works, he was just trying to save
some time.

-- 

John Baldwin <[EMAIL PROTECTED]> -- http://www.FreeBSD.org/~jhb/
PGP Key: http://www.baldwin.cx/~john/pgpkey.asc
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



Re: removing global from tree

2000-10-14 Thread David O'Brien

On Sat, Oct 14, 2000 at 10:32:11PM +0200, Gerhard Sittig wrote:
> Backing out an rm'ed file should be as difficult as doing the sequence
> I just tested to make sure:
> 
>   F=toberemoved.txt

Coming up with the "F" list can be more than just ``ls -R
/home/ncvs/src/contrib/global'' as older versions of global might have
had files that weren't part of the the last version.  Thus I'd have had
to keep the commit message (or go find it in the archive, which would be
some effort), to get the real list of files to revive.


>   F=toberemoved.txt  # the name is misleading now :)
>   cvs log $F
>   REV=1.2  # the one before removal
>   cvs up -p -r$REV $F > $F
>   cvs add $F
>   cvs ci -m "revived file $F"
>   # and everything could be like before ...

As you've just shown, this can be a real PITA.
 

> But I feel that David wants to know this, too.

Huh?  Do what??  I fully understand how to remove, add, and revive files
in the repo.

-- 
-- David  ([EMAIL PROTECTED])


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



Re: removing global from tree

2000-10-14 Thread Steve Kargl

Gerhard Sittig wrote:
> On Sat, Oct 14, 2000 at 11:16 -0700, John Baldwin wrote:
> > 
> > On 14-Oct-00 Gerhard Sittig wrote:
> > > 
> > > Up to now I always thought "the Attic" is something CVS
> > > itself takes care of when "cvs rm"ing files.  What's that
> > > special thing needing manual intervention or special
> > > attention you've been talking about lately?  Is it for
> > > performance reasons or for the warm fuzzy feelings of having
> > > "not too rotten a repo"?
> > 
> > It is where CVS puts files when you cvs rm them.  You just have
> > to do the actual cvs rm/cvs ci.  David was cautious because if
> > he had to back the change out, he didn't want to have to try to
> > cvs add all of the files back in.
> 
> Isn't it true that all the "log", "diff", "up -r" and such
> commands still work in the expected way?  That's the reason for
> having "the Attic", I thought.  Not to remove the repo file when
> the working file expires, but to keep the history and to restore
> any previous revision thereof when requested.  Backing out an
> rm'ed file should be as difficult as doing the sequence I just
> tested to make sure:
> 

If I understands cvs docs, the problem isn't with individual
files.  Cvs doesn't handle the removal and restoration of
directories very well.

-- 
Steve


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



Re: removing global from tree

2000-10-14 Thread Gerhard Sittig

On Sat, Oct 14, 2000 at 11:16 -0700, John Baldwin wrote:
> 
> On 14-Oct-00 Gerhard Sittig wrote:
> > 
> > Up to now I always thought "the Attic" is something CVS
> > itself takes care of when "cvs rm"ing files.  What's that
> > special thing needing manual intervention or special
> > attention you've been talking about lately?  Is it for
> > performance reasons or for the warm fuzzy feelings of having
> > "not too rotten a repo"?
> 
> It is where CVS puts files when you cvs rm them.  You just have
> to do the actual cvs rm/cvs ci.  David was cautious because if
> he had to back the change out, he didn't want to have to try to
> cvs add all of the files back in.

Isn't it true that all the "log", "diff", "up -r" and such
commands still work in the expected way?  That's the reason for
having "the Attic", I thought.  Not to remove the repo file when
the working file expires, but to keep the history and to restore
any previous revision thereof when requested.  Backing out an
rm'ed file should be as difficult as doing the sequence I just
tested to make sure:

  F=toberemoved.txt
  touch $F
  cvs add $F
  cvs ci -m "touched only"
  # creation time (birth, still a lot to learn)

  $EDITOR $F
  cvs ci -m "filled with real content"
  # that's when it's needed and existent

  rm $F
  cvs rm $F
  cvs ci -m "removed the file"
  # that's when it died

  # time passes, nobody misses the gone file, but then ...

  F=toberemoved.txt  # the name is misleading now :)
  cvs log $F
  REV=1.2  # the one before removal
  cvs up -p -r$REV $F > $F
  cvs add $F
  cvs ci -m "revived file $F"
  # and everything could be like before ...

The "cvs log $F" snippet even gives hope for the repo according
to "there could be too much bloat".  Have a look at the changed
lines count, obviously only state changes:

-
revision 1.4
date: 2000/10/14 20:10:15;  author: sittig;  state: Exp;  lines: +0 -0
revived it

revision 1.3
date: 2000/10/14 20:08:33;  author: sittig;  state: dead;  lines: +0 -0
removed it

revision 1.2
date: 2000/10/14 20:08:00;  author: sittig;  state: Exp;  lines: +49 -0
filled with rc.conf

revision 1.1
date: 2000/10/14 20:07:24;  author: sittig;  state: Exp;
touched
-

I understand that this thread is OT here.  But I feel that David
wants to know this, too.  And maybe others.  So I would like to
renew my question "Why does anyone feel the need to care about
cvs' internals if not for knowing better?".  This must be some
very special requirement why anyone feels like fiddling manually
with it.


virtually yours   82D1 9B9C 01DC 4FB4 D7B4  61BE 3F49 4F77 72DE DA76
Gerhard Sittig   true | mail -s "get gpg key" [EMAIL PROTECTED]
-- 
 If you don't understand or are scared by any of the above
 ask your parents or an adult to help you.


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



Re: removing global from tree

2000-10-14 Thread John Baldwin


On 14-Oct-00 Gerhard Sittig wrote:
> On Sat, Oct 14, 2000 at 05:35 -0700, David O'Brien wrote:
>> 
>> I didn't put it in the Attic when I disconnected it from the
>> build in case someone came forward screaming about removing it.
>> I figured it was much easier to back out a Makefile commit than
>> get things from the Attic back to being alive.  I had actually
>> forgotten about it as no one did come forward.
> 
> Up to now I always thought "the Attic" is something CVS itself
> takes care of when "cvs rm"ing files.  What's that special thing
> needing manual intervention or special attention you've been
> talking about lately?  Is it for performance reasons or for the
> warm fuzzy feelings of having "not too rotten a repo"?

It is where CVS puts files when you cvs rm them.  You just have to
do the actual cvs rm/cvs ci.  David was cautious because if he had
to back the change out, he didn't want to have to try to cvs add
all of the files back in.

-- 

John Baldwin <[EMAIL PROTECTED]> -- http://www.FreeBSD.org/~jhb/
PGP Key: http://www.baldwin.cx/~john/pgpkey.asc
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



Re: removing global from tree

2000-10-14 Thread Gerhard Sittig

On Sat, Oct 14, 2000 at 05:35 -0700, David O'Brien wrote:
> 
> I didn't put it in the Attic when I disconnected it from the
> build in case someone came forward screaming about removing it.
> I figured it was much easier to back out a Makefile commit than
> get things from the Attic back to being alive.  I had actually
> forgotten about it as no one did come forward.

Up to now I always thought "the Attic" is something CVS itself
takes care of when "cvs rm"ing files.  What's that special thing
needing manual intervention or special attention you've been
talking about lately?  Is it for performance reasons or for the
warm fuzzy feelings of having "not too rotten a repo"?

Sorry for being OT.  Of course I welcome pointers to existing
documentation and FAQs, too.


virtually yours   82D1 9B9C 01DC 4FB4 D7B4  61BE 3F49 4F77 72DE DA76
Gerhard Sittig   true | mail -s "get gpg key" [EMAIL PROTECTED]
-- 
 If you don't understand or are scared by any of the above
 ask your parents or an adult to help you.


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



Re: removing global from tree

2000-10-14 Thread David O'Brien

On Fri, Oct 13, 2000 at 10:01:59AM -0700, Steve Kargl wrote:
> In revision 1.148 of src/usr.bin/Makefile, the hook for building
> global was removed.  This was 3.5 month ago.  Is it time to move
> src/contrib/global and src/usr.bin/global into the attic?

Wow, that is still there.  I forgot about it.  I'll take care of this
weekend.


On Sat, Oct 14, 2000 at 03:03:57AM -0700, [EMAIL PROTECTED] wrote:
> Yes, it should have been done at the time it was removed from the
> Makefile.

I didn't put it in the Attic when I disconnected it from the build in
case someone came forward screaming about removing it.  I figured it was
much easier to back out a Makefile commit than get things from the Attic
back to being alive.  I had actually forgotten about it as no one did
come forward.

-- 
-- David  ([EMAIL PROTECTED])
  GNU is Not Unix / Linux Is Not UniX


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



Re: removing global from tree

2000-10-14 Thread jdp

In article <[EMAIL PROTECTED]>,
Steve Kargl  <[EMAIL PROTECTED]> wrote:
> In revision 1.148 of src/usr.bin/Makefile, the hook for building
> global was removed.  This was 3.5 month ago.  Is it time to move
> src/contrib/global and src/usr.bin/global into the attic?

Yes, it should have been done at the time it was removed from the
Makefile.

John
-- 
  John Polstra   [EMAIL PROTECTED]
  John D. Polstra & Co., Inc.Seattle, Washington USA
  "Disappointment is a good sign of basic intelligence."  -- Chögyam Trungpa



To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message



removing global from tree

2000-10-13 Thread Steve Kargl

In revision 1.148 of src/usr.bin/Makefile, the hook for building
global was removed.  This was 3.5 month ago.  Is it time to move
src/contrib/global and src/usr.bin/global into the attic?
 
-- 
Steve


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message