From: Eric S. Raymond <esr@thyrsus.com>
Date: Tue, 11 Nov 2014 04:02:21 +0000 (-0500)
Subject: Opt for non-strict locking. Regression test passes.
X-Git-Tag: 0.5~30
X-Git-Url: http://thyrsus.com/gitweb/?a=commitdiff_plain;h=ed8ff5c9f973b97c698904c3609225aecec0ac3d;p=src.git

Opt for non-strict locking. Regression test passes.
---

diff --git a/src b/src
index 947112f..38743d7 100755
--- 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