Update to version 0.14.2. Changes since last snapshot:

    fix: stg mail crashes when there is no patch description

    Better "stg rebase" help text

    Enhance rebase help string by providing guidance on merge conflict
    resolution during a rebase.

    Based on text suggested by Catalin Marinas.

    Test the 'stg rename' command

    Simple rename of top-most patch

    Allow renaming of the top-most patch just by calling stg rename
    <new-patch-name>, instead of stg rename <old> <new>. This is for
    example helpful for those people who always have a typo or two in
    their patch names.

    Make documentation less confusing

    It's not just by default "stg new" doesn't do a refresh -- it never
    does.

    replace "git repo-config" usage by "git config"

    Remove a newline from the e-mail template

    Allow picking of one commit id

    Remove the reordering side-effect of the latter sync changes

    Fix sync to push the popped patches back after sync'ing

    Add a boundary to parse_patches in pick.py

    Refuse to send empty patches

    Set umask to 0022 during the setup.py execution

    This allows template files to be installed with the proper rights.

    Modify 'series' to use '#' instead of '|'

    Allow the synchronisation of the unapplied patches

    Check for unnecessary push/pop in 'float'

    Allow pick to import multiple patches

    This patch allows multiple patches on the "pick" command line.

    Don't set the default authdate if none specified

    This way, we allow a patch editing to remove an existing date by not
    specifying it.

4 files changed, 25 insertions, 32 deletions

diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile
index 7066ad47bb3..9dc4275ed61 100644
--- a/devel/stgit/Makefile
+++ b/devel/stgit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/02/28 15:27:21 bjs Exp $
+# $NetBSD: Makefile,v 1.7 2008/04/10 12:11:34 bjs Exp $
 
-DISTNAME=	stgit-20080220
+DISTNAME=	stgit-0.14.2
 CATEGORIES=	devel
-MASTER_SITES=	http://homepage.ntlworld.com/cmarinas/stgit/snapshots/
+MASTER_SITES=	http://homepage.ntlworld.com/cmarinas/stgit/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.procode.org/stgit/
diff --git a/devel/stgit/PLIST b/devel/stgit/PLIST
index cd3b9fb2b92..50ccd61f76b 100644
--- a/devel/stgit/PLIST
+++ b/devel/stgit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/02/11 20:18:56 bjs Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/04/10 12:11:34 bjs Exp $
 bin/stg
 bin/stg-cvs
 bin/stg-dispatch
@@ -20,6 +20,9 @@ ${PYSITELIB}/stgit/basedir.pyo
 ${PYSITELIB}/stgit/commands/__init__.py
 ${PYSITELIB}/stgit/commands/__init__.pyc
 ${PYSITELIB}/stgit/commands/__init__.pyo
+${PYSITELIB}/stgit/commands/add.py
+${PYSITELIB}/stgit/commands/add.pyc
+${PYSITELIB}/stgit/commands/add.pyo
 ${PYSITELIB}/stgit/commands/applied.py
 ${PYSITELIB}/stgit/commands/applied.pyc
 ${PYSITELIB}/stgit/commands/applied.pyo
@@ -32,15 +35,15 @@ ${PYSITELIB}/stgit/commands/clean.pyo
 ${PYSITELIB}/stgit/commands/clone.py
 ${PYSITELIB}/stgit/commands/clone.pyc
 ${PYSITELIB}/stgit/commands/clone.pyo
-${PYSITELIB}/stgit/commands/coalesce.py
-${PYSITELIB}/stgit/commands/coalesce.pyc
-${PYSITELIB}/stgit/commands/coalesce.pyo
 ${PYSITELIB}/stgit/commands/commit.py
 ${PYSITELIB}/stgit/commands/commit.pyc
 ${PYSITELIB}/stgit/commands/commit.pyo
 ${PYSITELIB}/stgit/commands/common.py
 ${PYSITELIB}/stgit/commands/common.pyc
 ${PYSITELIB}/stgit/commands/common.pyo
+${PYSITELIB}/stgit/commands/copy.py
+${PYSITELIB}/stgit/commands/copy.pyc
+${PYSITELIB}/stgit/commands/copy.pyo
 ${PYSITELIB}/stgit/commands/delete.py
 ${PYSITELIB}/stgit/commands/delete.pyc
 ${PYSITELIB}/stgit/commands/delete.pyo
@@ -116,6 +119,9 @@ ${PYSITELIB}/stgit/commands/repair.pyo
 ${PYSITELIB}/stgit/commands/resolved.py
 ${PYSITELIB}/stgit/commands/resolved.pyc
 ${PYSITELIB}/stgit/commands/resolved.pyo
+${PYSITELIB}/stgit/commands/rm.py
+${PYSITELIB}/stgit/commands/rm.pyc
+${PYSITELIB}/stgit/commands/rm.pyo
 ${PYSITELIB}/stgit/commands/series.py
 ${PYSITELIB}/stgit/commands/series.pyc
 ${PYSITELIB}/stgit/commands/series.pyo
@@ -155,21 +161,6 @@ ${PYSITELIB}/stgit/git.pyo
 ${PYSITELIB}/stgit/gitmergeonefile.py
 ${PYSITELIB}/stgit/gitmergeonefile.pyc
 ${PYSITELIB}/stgit/gitmergeonefile.pyo
-${PYSITELIB}/stgit/lib/__init__.py
-${PYSITELIB}/stgit/lib/__init__.pyc
-${PYSITELIB}/stgit/lib/__init__.pyo
-${PYSITELIB}/stgit/lib/git.py
-${PYSITELIB}/stgit/lib/git.pyc
-${PYSITELIB}/stgit/lib/git.pyo
-${PYSITELIB}/stgit/lib/stack.py
-${PYSITELIB}/stgit/lib/stack.pyc
-${PYSITELIB}/stgit/lib/stack.pyo
-${PYSITELIB}/stgit/lib/stackupgrade.py
-${PYSITELIB}/stgit/lib/stackupgrade.pyc
-${PYSITELIB}/stgit/lib/stackupgrade.pyo
-${PYSITELIB}/stgit/lib/transaction.py
-${PYSITELIB}/stgit/lib/transaction.pyc
-${PYSITELIB}/stgit/lib/transaction.pyo
 ${PYSITELIB}/stgit/main.py
 ${PYSITELIB}/stgit/main.pyc
 ${PYSITELIB}/stgit/main.pyo
@@ -193,12 +184,14 @@ ${PYSITELIB}/stgit/version.pyc
 ${PYSITELIB}/stgit/version.pyo
 man/man1/stg-branch.1
 man/man1/stg-clone.1
+man/man1/stg-cp.1
 man/man1/stg-init.1
 man/man1/stg-new.1
 man/man1/stg-sink.1
 man/man1/stg.1
 share/doc/stgit/html/stg-branch.html
 share/doc/stgit/html/stg-clone.html
+share/doc/stgit/html/stg-cp.html
 share/doc/stgit/html/stg-init.html
 share/doc/stgit/html/stg-new.html
 share/doc/stgit/html/stg-sink.html
@@ -215,7 +208,7 @@ share/stgit/templates/patchmail.tmpl
 @dirrm share/stgit/contrib
 @dirrm share/stgit
 @dirrm share/examples/stgit
+@dirrm share/doc/stgit/html
 @dirrm share/doc/stgit
-@dirrm ${PYSITELIB}/stgit/lib
 @dirrm ${PYSITELIB}/stgit/commands
 @dirrm ${PYSITELIB}/stgit
diff --git a/devel/stgit/distinfo b/devel/stgit/distinfo
index 7bada8e31b6..49ee5e84741 100644
--- a/devel/stgit/distinfo
+++ b/devel/stgit/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/02/28 15:27:21 bjs Exp $
+$NetBSD: distinfo,v 1.7 2008/04/10 12:11:34 bjs Exp $
 
-SHA1 (stgit-20080220.tar.gz) = b17a875eb60833efc699dec94a0c366e5ad4dda3
-RMD160 (stgit-20080220.tar.gz) = 8ab31bd2f20662e00fb055b89be0ee20d21e7c6c
-Size (stgit-20080220.tar.gz) = 240525 bytes
+SHA1 (stgit-0.14.2.tar.gz) = 9cd3e4368fd36ea77c48eff4fd305d05469e8010
+RMD160 (stgit-0.14.2.tar.gz) = 566bbcccc93c3c011c866620992ff9e479ea902f
+Size (stgit-0.14.2.tar.gz) = 225695 bytes
 SHA1 (patch-aa) = 364103963f8e74eee12dbd548b4ed48b349b662f
-SHA1 (patch-ab) = 423664a988eb1c69c76adc482d74c4e8e227a83f
+SHA1 (patch-ab) = 4808d98409c39cd6af33aad1b318a8df41c9cfec
 SHA1 (patch-ac) = ae316f684e33cca913be25a3f697ee8052218eaf
diff --git a/devel/stgit/patches/patch-ab b/devel/stgit/patches/patch-ab
index 67635ca1b58..2ba35bc3559 100644
--- a/devel/stgit/patches/patch-ab
+++ b/devel/stgit/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1 2008/01/30 23:03:51 bjs Exp $
+$NetBSD: patch-ab,v 1.2 2008/04/10 12:11:34 bjs Exp $
 
---- setup.py.orig	2007-12-19 18:15:14.000000000 -0500
+--- setup.py.orig	2008-03-24 15:21:30.000000000 -0400
 +++ setup.py
-@@ -59,10 +59,8 @@ setup(name = 'stgit',
+@@ -62,10 +62,8 @@ setup(name = 'stgit',
        scripts = ['stg'],
-       packages = ['stgit', 'stgit.commands', 'stgit.lib'],
+       packages = ['stgit', 'stgit.commands'],
        data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')),
 -                    ('share/stgit/examples', glob.glob('examples/*.tmpl')),
 -                    ('share/stgit/examples', ['examples/gitconfig']),