diff options
Diffstat (limited to 'src')
-rwxr-xr-x | src | 29 |
1 files changed, 19 insertions, 10 deletions
@@ -20,12 +20,13 @@ # for future checkouts and for branching. # # With sufficient cleverness it would be possible to go in a different -# direction - leave the master unlocked at all times except during during -# the commit sequence, intervening with a chmod to turn off write protection -# on the workfile when RCS/SCCS would normally turn it on. I had this as -# a to-do for a long time but have abandoned the concept; fighting RCS/SCCS's -# notion of when the workfile ought to be write-locked seems too likely to -# lead to weird bugs in unexpected situations. +# direction - leave the master unlocked at all times except during +# during the commit sequence, intervening with a chmod to turn off +# write protection on the workfile when RCS/SCCS would normally turn +# it on. I had this as a to-do for a long time but have abandoned the +# concept; fighting RCS/SCCS's notion of when the workfile ought to be +# write-locked seems too likely to lead to weird bugs in unexpected +# situations. # # In an ideal world, we'd get rid of A status. The SCCS back end doesn't # have it, because the only way to register new content is by "sccs add" @@ -80,7 +81,7 @@ try: except ImportError: pass -version="1.20" +version="1.21" CENTURY = "20" # A Y2.1K problem, but only for SCCS. @@ -2510,8 +2511,16 @@ class RCS(RevisionMixin): # 1.1.2.0 - Second branch from v1.1 # 1.2 - next checkin on trunk. # -# The main difference is that you cannot branch from a branch, only from -# trunk. +# The main difference is that in origninal AT&T SCCS you could not +# branch from a branch, only from trunk. This restriction was removed +# in at least some later versions, including CSSC and the Schilling +# fork. In sextion 3.5.3 the CSSC manual says +# +# "When a branch is created from an existing sid, the release and level +# numbers are copied, the branch number is set to the lowest unused +# value for that release and level, and the sequence number is set to +# one. Hence the first branch from version 1.1 will be version 1.1.1.1, +# and if a branch is made from that, its sid will be 1.1.2.1." class SCCS(RevisionMixin): "Encapsulate SCCS back end methods." @@ -2619,7 +2628,7 @@ class SCCS(RevisionMixin): self.history(target))) def release(self, arg): "Release locks." - do_or_die("cssc admin -dla '{0}'".format(arg)) + do_or_die("sccs admin -dla '{0}'".format(arg)) def write_description(self, text, metadata): "Write description field. If text is empty, clear the field." if text: |