Re: remove empty TEMPROOT dirs at mergemaster's end? (was: cvs commit: src/usr.sbin/mergemaster mergemaster.sh)
Gerhard Sittig wrote:
On Thu, Aug 17, 2000 at 12:38 -0700, Doug Barton wrote:
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.".
But that only matters to people who go in there by hand, and that's a very
small percentage.
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. :)
99% of the files you'd ever want to merge by hand are in /etc. Not too
hard to remember. :)
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)'
I was attempting to make a rather poor joke, actually. It would be much
easier to do 'find . -type f -size +0'. The point is that mm already
handles the cases that a normal user is likely to need handled. People who
want to go tromping through directory structures should be learning the
proper use of unix commands that already exist for those purposes. For
instance, if you actually wanted to prune the directory structure 'find -d
. -type d -links 2 -exec rmdir {} \;' would do a pretty good job
Doug
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-stable" in the body of the message
Re: remove empty TEMPROOT dirs at mergemaster's end? (was: cvs commit: src/usr.sbin/mergemaster mergemaster.sh)
Jason T wrote:
I think I can clarify. If mergemaster leaves ANY files behind, it also leave
the subdirectories, even the empty ones. The request is to have empty
subdirectories (of ${TEMPROOT}) removed automatically. This benefits anyone,
experienced or novice, who leaves some files behind for more deliberate
examination after mergemaster.
I understand the conditions. What I don't understand is what the benefit
is. HOW does removing the directories help? Almost every single file that
you would want to re-examine is going to be in the temp etc. The exceptions
are too insignificant to worry about. Also, the other reason to leave the
directory behind is so that if you have to rebuild it, it won't take as
long. Deleting the file hierarchy defeats that purpose.
The request was to make this standard mergemaster behavior, not another expert
option.
Well, I missed that bit. I have to confess that the whole point of this
request totally escapes me. But, I had a crappy day at work today so maybe
that's clouded my judgement or something. In this particular case if I get
a lot of "me too's" (private please) then I guess we can add this, but
frankly I think that we're talking about window dressing that's at best a
50:50 in the cost:benefit department.
Doug
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-stable" in the body of the message
Re: remove empty TEMPROOT dirs at mergemaster's end? (was: cvs commit: src/usr.sbin/mergemaster mergemaster.sh)
On Wed, Aug 16, 2000 at 07:02 -0700, Brian Somers wrote:
brian 2000/08/16 07:02:30 PDT
Modified files:(Branch: RELENG_4)
usr.sbin/mergemaster mergemaster.sh
Log:
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.
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.
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-stable" in the body of the message
