Opt for non-strict locking. Regression test passes.

diff --git a/src b/src
index 947112f9798ae9c244549778b6192fcebcd2eff6..38743d7c8cf3b858f08270e129322cfb4af3c3ca 100755 (executable)
--- a/src
+++ b/src
@@ -935,7 +935,9 @@ class RCS:
         return arg[:-2]
     def add(self, arg):
         "Register a file"
-        do_or_die("rcs -q -kb -i {0} </dev/null && mv {0},v {1}".format(arg, repodir))
+        # Key choices here: -b suppresses all keyword expansion, -U sets
+        # non-strict locking (which makes branch appends less painful).
+        do_or_die("rcs -q -U -kb -i {0} </dev/null && mv {0},v {1}".format(arg, repodir))
     def checkin(self, arg, comment):
         "Check in a commit, with comment."
         # Relies on caller to escape comment string