Re: bin/42031: mtree(8) -M (merge) option broken

[Geoff Wing <gcw%pobox.com@localhost>]

The following reply was made to PR bin/42031; it has been noted by GNATS.

From: Geoff Wing <gcw%pobox.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: bin/42031: mtree(8) -M (merge) option broken
Date: Fri, 11 Sep 2009 10:39:04 +1000

 Here's my first regress attempt.
 
 Regards,
 Geoff
 
 --- regress/Makefile   21 Dec 2008 00:24:06 -0000      1.16
 +++ regress/Makefile   11 Sep 2009 00:32:22 -0000
 @@ -1,6 +1,6 @@
  #     $NetBSD: Makefile,v 1.16 2008/12/21 00:24:06 christos Exp $
  
  # missing: libexec sbin usr.sbin share
 -SUBDIR+= bin gnu include lib libexec sys usr.bin
 +SUBDIR+= bin gnu include lib libexec sys usr.bin usr.sbin
  
  .include <bsd.subdir.mk>
 --- /dev/null  2009-09-11 04:31:33.000000000 +1000
 +++ regress/usr.sbin/Makefile  2009-09-11 10:25:19.000000000 +1000
 @@ -0,0 +1,5 @@
 +#     $NetBSD: Makefile,v Exp $
 +
 +SUBDIR+= mtree
 +
 +.include <bsd.subdir.mk>
 --- /dev/null  2009-09-11 04:31:33.000000000 +1000
 +++ regress/usr.sbin/mtree/Makefile    2009-09-11 10:27:10.000000000 +1000
 @@ -0,0 +1,15 @@
 +#     $NetBSD: Makefile,v Exp $
 +
 +.include <bsd.sys.mk>
 +
 +NOMAN=        # defined
 +
 +PROG= mtree
 +
 +regress: test-merge
 +
 +test-merge:
 +      ${PROG} -CM <${.CURDIR}/merge1.in  >merge1.out; \
 +      tail +4 ${.CURDIR}/merge1.exp | diff - merge1.out;
 +
 +.include <bsd.prog.mk>
 --- /dev/null  2009-09-11 04:31:33.000000000 +1000
 +++ regress/usr.sbin/mtree/merge1.exp  2009-09-11 10:29:18.000000000 +1000
 @@ -0,0 +1,6 @@
 +# $NetBSD:  Exp $
 +# Real data starts on line 4
 +
 +. type=dir 
 +./etc type=dir 
 +./etc/namedb type=link mode=0755 
 --- /dev/null  2009-09-11 04:31:33.000000000 +1000
 +++ regress/usr.sbin/mtree/merge1.in   2009-09-11 10:21:22.000000000 +1000
 @@ -0,0 +1,6 @@
 +# $NetBSD:  Exp $
 +#
 +.                             type=dir
 +./etc                         type=dir
 +./etc/namedb                    type=dir  mode=0755
 +./etc/namedb                    type=link  mode=0755