]> thyrsus.com Git - src.git/commitdiff
Allow cross-directory moves to work.
authorEric S. Raymond <esr@thyrsus.com>
Sat, 8 Nov 2014 21:11:50 +0000 (16:11 -0500)
committerEric S. Raymond <esr@thyrsus.com>
Sat, 8 Nov 2014 21:12:57 +0000 (16:12 -0500)
Regression test passes.

src

diff --git a/src b/src
index 27f396a8b7a6e7b08e85ac0c18ebae8c0f328675..67df2b50f06f10c748616c60f3f78543e708c507 100755 (executable)
--- a/src
+++ b/src
@@ -750,7 +750,12 @@ class RCS:
     def lifter(self, name):
         return RCS.RCSLifter(name)
     def master(self, arg):
-        return os.path.join(repodir, arg + ",v")
+        if os.sep not in arg:
+            return os.path.join(repodir, arg + ",v")
+        else:
+            return os.path.join(os.path.dirname(arg),
+                                repodir,
+                                os.path.basename(arg) + ",v")
     def workfile(self, arg):
         return arg[:-2]
     def add(self, arg):