From owner-freebsd-stable Fri Aug 18 12:16:56 2000 Delivered-To: freebsd-stable@freebsd.org Received: from mail.gmx.net (pop.gmx.net [194.221.183.20]) by hub.freebsd.org (Postfix) with SMTP id CD94737B422 for ; Fri, 18 Aug 2000 12:16:52 -0700 (PDT) Received: (qmail 25423 invoked by uid 0); 18 Aug 2000 19:16:43 -0000 Received: from p3ee21634.dip.t-dialin.net (HELO speedy.gsinet) (62.226.22.52) by mail.gmx.net with SMTP; 18 Aug 2000 19:16:43 -0000 Received: (from sittig@localhost) by speedy.gsinet (8.8.8/8.8.8) id TAA10221 for freebsd-stable@FreeBSD.org; Fri, 18 Aug 2000 19:37:08 +0200 Date: Fri, 18 Aug 2000 19:37:08 +0200 From: Gerhard Sittig To: FreeBSD stable Subject: Re: remove empty TEMPROOT dirs at mergemaster's end? (was: cvs commit: src/usr.sbin/mergemaster mergemaster.sh) Message-ID: <20000818193708.T252@speedy.gsinet> Mail-Followup-To: FreeBSD stable References: <200008171114.e7HBEuq01585@hak.lan.Awfulhak.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0i In-Reply-To: ; from Doug@gorean.org on Thu, Aug 17, 2000 at 12:38:54PM -0700 Organization: System Defenestrators Inc. Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Thu, Aug 17, 2000 at 12:38 -0700, Doug Barton wrote: > On Thu, 17 Aug 2000, Brian Somers wrote: [ third indentation level is mine - Gerhard Sittig ] > > > This would probably be quite useful. > > > > What do you think Doug (cc'd) ? > > [ ... ] > > > > While I see you editing this script: Is it a good idea to > > > clean out the empty directories at the "Do you wish to > > > delete what is left of ${TEMPROOT}? [no] " stage when > > > TEMPROOT is meant to stay? I felt it to be somewhat > > > uncomfortable to wade through the tree just to find there's > > > almost nothing left to compare. > > I think I am confused, but that's why we like to solicit > feedback from users. :) Most of the time when people leave them > temproot directory around it's to deal with a specific file or > files that they decided to merge later. If you leave that > directory behind and there are real files left to deal with mm > spits out a list of files for your consideration, which can be > handled with 'mergemaster -r' or by hand. That's when I thought "Why not make the directory hierarchy look like the mm list of what needs further attention? Without burying these files in a tree with mostly empty directories.". > I guess what I'm confused about is what you are wading through > and why. If I knew the answer to that, I would know better how > to answer your question. As it is, I don't understand why an > option is required to do what 'find . -type d -size 0 -delete' > will do for you. I'm not trying to be sarcastic, I just really > don't understand your request. I'm human and thus I'm subject to forgetting what I've seen before on the screen (the file list) once I had a look at the first two files and managing the needed merge. :) But I take your point of "a simple command can do what you asked for". And I understand that putting this one liner into a block of asking the user (and maybe have a conf switch for non interactive mode) is overkill. And I appreciate your making clear "we (I?) dont want _this_kind_ of complexity in mergemaster", since the advantages are *not* obvious and are outweighted by the downside part. I see that my wish came from not understanding what I really wanted. :) > > > Unless I've overlooked something obvious and you stop me, I > > > would file a PR with a patch how to expand the " *** > > > ${TEMPROOT} will remain" case with a question for removal > > > of all the unnecessary stuff. I guess empty files should > > > remain, but empty directories could be subject to deletion. That's where I *did* overlook the main reason for leaving $TEMPROOT intact -- a feature I haven't used before. You pointed out in a different message that one does so for further mm runs. Thank you for stopping me in time! :> Maybe what is left to do is a one (or two) line patch adding some echo 'to remove the empty dirs but leave the files intact type' echo '"find' ${TEMPROOT} '-type d -size 0 -delete" (w/o quotes)' commands into the "${TEMPROOT} will remain" case to help those who can't think of this very command themselfes -- like I did. This could make those people happy who thought my suggestion to be a good idea. After thinking about your points I cannot think of a need for my first approach any longer ... virtually yours 82D1 9B9C 01DC 4FB4 D7B4 61BE 3F49 4F77 72DE DA76 Gerhard Sittig true | mail -s "get gpg key" Gerhard.Sittig@gmx.net -- 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 majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message