freebsd-nq/usr.sbin/mergemaster
Doug Barton 1b855ebe6c 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.
2009-05-16 22:22:31 +00:00
..
Makefile
mergemaster.8 Don't tempt svn to expand the example $FreeBSD strings 2009-03-23 14:42:41 +00:00
mergemaster.sh Enhance the safety of the -U option: 2009-05-16 22:22:31 +00:00