Date: Sat, 16 May 2009 22:22:31 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <200905162222.n4GMMkDe092836@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2009-05-16 22:22:31 UTC
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.sh
Log:
SVN rev 192230 on 2009-05-16 22:22:31Z by dougb
Enhance the safety of the -U option:
1. In several places make sure that the mtree database is not empty using
the -s argument to test instead of -f. (I thought I'd already changed this,
but obviously not.)
2. When deriving the list of changed files use a colon-delimited list.
3. If the list of changed files is empty, unset the variable, and test
for a non-empty CHANGED in diff_loop() before entering that routine.
Enhance the speed of the -U option by using an internal case statement
instead of echoing the variable to an external grep for every file.
Fix indentation on one line.
Revision Changes Path
1.71 +13 -9 src/usr.sbin/mergemaster/mergemaster.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905162222.n4GMMkDe092836>