Changeset 483 in tailor

Timestamp:

08/05/05 00:25:05 (8 years ago)

Author:

lele@…

Hash name:

20050804222505-97f81-6f6b32187b11f6bef430cd8a47893e3f99dfb1da

Message:

Pass down the complete path to the working dir, not just root

File:

• vcpx/project.py (modified) (2 diffs)

vcpx/project.py

@@ -233 +233 @@
         """
 
+        from os.path import join
+
+        wdir = join(self.root, self.subdir)
         dwd = self.workingDir()
         try:
-            pendings = dwd.getPendingChangesets(self.root,
+            pendings = dwd.getPendingChangesets(wdir,
                                                 self.source.repository,
                                                 self.source.module)
@@ -252 +255 @@
             try:
                 last, conflicts = dwd.applyPendingChangesets(
-                    self.root, self.source.module,
+                    wdir, self.source.module,
                     applyable=self._applyable, applied=self._applied,
                     logger=self.logger, delayed_commit=self.single_commit)