From: Ken Hornstein <kenh@pobox.com>
Date: Thu, 21 Mar 2013 21:14:30 +0000 (-0400)
Subject: Merge branch 'newlock'
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/17932f7aea1c21cf17738f47996345d9d0a6ce51?ds=inline;hp=--cc

Merge branch 'newlock'
---

17932f7aea1c21cf17738f47996345d9d0a6ce51
diff --cc Makefile.am
index a18a7c63,074adb26..1e64f159
--- a/Makefile.am
+++ b/Makefile.am
@@@ -58,9 -59,10 +59,11 @@@ TESTS = test/ali/test-ali test/anno/tes
  	test/inc/test-deb359167 test/inc/test-eom-align \
  	test/inc/test-inc-scanout test/inc/test-msgchk \
  	test/inc/test-pop \
- 	test/install-mh/test-install-mh test/manpages/test-manpages \
+ 	test/install-mh/test-install-mh \
+ 	test/locking/test-datalocking test/locking/test-spoollocking \
+ 	test/manpages/test-manpages \
  	test/mhbuild/test-forw test/mhbuild/test-utf8-body \
 +	test/mhfixmsg/test-mhfixmsg \
  	test/mhlist/test-mhlist test/mhmail/test-mhmail \
  	test/mhparam/test-mhparam test/mhpath/test-mhpath \
  	test/mhshow/test-cte-binary test/mhshow/test-qp \
diff --cc docs/pending-release-notes
index 899318ef,3ff8fbd9..e275dfa6
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@@ -44,12 -44,7 +44,13 @@@ NEW FEATURE
  - A new program, fmttest(1) is included to help debug format files
  - mhshow/mhstore now have support for RFC-2017 (access-type=url) for
    external message bodies.
 +- Added -retainsequences switch to refile(1).
 +- A new program, mhfixmsg(1), is included to rewrite MIME messages with
 +  various transformations.
 +- Added -[no]rmmproc switches to rmm(1).
 +- Added support for Content-Disposition header (RFC 2183) to mhstore(1)
 +  and mhn(1) when used with -auto.
+ - All nmh commands now support transactional locking for sequence files.
  
  ----------------------------
  OBSOLETE/DEPRECATED FEATURES