Date: Fri, 8 Jan 2010 00:05:10 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/usr.sbin/mergemaster mergemaster.8 mergemaster.sh Message-ID: <201001080005.o0805JV4051524@repoman.freebsd.org>
index | next in thread | raw e-mail
dougb 2010-01-08 00:05:10 UTC
FreeBSD src repository
Modified files:
usr.sbin/mergemaster mergemaster.8 mergemaster.sh
Log:
SVN rev 201765 on 2010-01-08 00:05:10Z by dougb
Update copyright date
Update delete_temproot() to include the error message if it fails,
and clean up the places where it's called.
If there are no files left in temproot when the comparison is done
delete it without prompting. This should make "automated" runs of
mergemaster without -a a little easier.
Document the new behavior in the man page.
Revision Changes Path
1.44 +10 -2 src/usr.sbin/mergemaster/mergemaster.8
1.80 +20 -22 src/usr.sbin/mergemaster/mergemaster.sh
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001080005.o0805JV4051524>