Regression test for branch deletion. All tests pass.

diff --git a/src b/src
index 1ed78a2a5890407c0555337c8057465fc48c647c..11ff43c9545edd0bba481896bc064738142aa540 100755 (executable)
--- a/src
+++ b/src
@@ -1007,6 +1007,8 @@ def tag_helper(args, legend, validation_hook, delete_method, set_method):
             for arg in ctx.args:
                 metadata = History(arg)
                 if name not in metadata.symbols:
+                    croak("in %s, %s is not a symbol" % (arg, name))
+                elif backend.isbranch(metadata.symbols[name]) != (legend  == "branch"):
                     croak("in %s, %s is not a %s" % (arg, name, legend))
                 else:
                     with backend.lifter(arg):

diff --git a/srctest b/srctest
index b20bb738929478acd2cfb722557f325dee7bcdae..5099841f7564d7cd517b36a807c113d2d7e3b989 100755 (executable)
--- a/srctest
+++ b/srctest
@@ -577,14 +577,14 @@ src $TESTOPTS status newname1 newname2 >tryit
 diff -u statuslog tryit
 check "status after ignore"
 
-src $TESTOPTS branch delete GORP sample
+src $TESTOPTS branch delete trunk sample
 check "branch delete"
 
 cat >newlist <<EOF
 = sample ====================================================================
    0   trunk
    3   muggle
-   8   sample
+   7   sample
 EOF
 
 src $TESTOPTS branch -l sample >tryit
@@ -593,31 +593,31 @@ check "branch list check after delete" delete
 
 cat >newlog <<EOF
 = sample ====================================================================
-13   | 1970-01-02T00:12:00Z
+12   | 1970-01-02T00:11:00Z
 I see you
 ------------------------------------------------------------------------------
-12   | 1970-01-02T00:11:00Z
+11   | 1970-01-02T00:10:00Z
 That's good.
 ------------------------------------------------------------------------------
-11   | 1970-01-02T00:10:00Z
+10   | 1970-01-02T00:09:00Z
 No good.
 ------------------------------------------------------------------------------
-10   | 1970-01-02T00:09:00Z
+9    | 1970-01-02T00:08:00Z
 It' all good.
 ------------------------------------------------------------------------------
-9    | 1970-01-02T00:08:00Z
+8    | 1970-01-02T00:07:00Z
 All fixed up.
 ------------------------------------------------------------------------------
-8    | 1970-01-02T00:07:00Z
+7    | 1970-01-02T00:06:00Z
 Utterly fubar
 ------------------------------------------------------------------------------
-7    | 1970-01-02T00:06:00Z
+6    | 1970-01-02T00:05:00Z
 Totally chenille.
 ------------------------------------------------------------------------------
-6    | 1970-01-02T00:05:00Z
+5    | 1970-01-02T00:04:00Z
 Still utterly fubar
 ------------------------------------------------------------------------------
-5    | 1970-01-02T00:04:00Z
+4    | 1970-01-02T00:03:00Z
 Totally unfubared.
 ------------------------------------------------------------------------------
 3    | 1970-01-02T00:02:00Z
@@ -635,6 +635,8 @@ src $TESTOPTS log sample >tryit
 diff -u newlog tryit
 check "content after branch deletion"
 
+echo "srctest: all tests succeeded"
+
 rm -fr $SANDBOX
 
 # end