Bug 25731

Summary: mergemaster -a is not automatic when it finds a file that is missing
Product: Base System Reporter: ggong <ggong>
Component: miscAssignee: Doug Barton <dougb>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: 4.2-STABLE   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description ggong 2001-03-12 11:20:01 UTC 
When mergemaster, running with -a, finds a file which does not exist in the target directory, it queries the user.

Fix: c161 - root@ggong:/usr/src/usr.sbin/mergemaster#diff -u mergemaster.orig.sh mergemaster.sh 
How-To-Repeat: run mergemaster -a with a file missing from a target directory.
Comment 1 Doug Barton freebsd_committer freebsd_triage 2001-03-25 10:00:41 UTC 
Responsible Changed
From-To: freebsd-bugs->dougb


mm is my baby, I'll be taking a look at this one
Comment 2 Doug Barton freebsd_committer freebsd_triage 2001-05-28 10:35:50 UTC 
State Changed
From-To: open->analyzed


Thank you for bringing this to my attention. I had to tweak the fix you 
supplied a little to handle the auto-install case. Also, for your own 
edification, the duplicate "continue" statements are redundant. If you're 
going to continue anyway it's slightly more efficient to put it outside 
the conditional. 

Will MFC after a bit.
Comment 3 Doug Barton freebsd_committer freebsd_triage 2001-06-04 05:18:14 UTC 
State Changed
From-To: analyzed->closed


Fix was MFC'ed