Changeset 15 in tailor

Timestamp:

06/20/04 12:05:59 (9 years ago)

Author:

lele@…

Hash name:

20040620100559-97f81-21ba797856dda2064ae74a3695ba41de5c2e72f2

Message:

Dual working directories

Location:

vcpx

Files:

• source.py (modified) (2 diffs)
• target.py (modified) (1 diff)
• dualwd.py (added)

vcpx/source.py

@@ -43 +43 @@
         return self._getUpstreamChangesets(self, root)
         
-    def applyUpstreamChangesets(self, root, changesets):
+    def applyUpstreamChangesets(self, root, changesets, replay=None):
         """
         Apply the collected upstream changes.
 
         Loop over the collected changesets, doing whatever is needed
-        to apply each one to the working dir.
+        to apply each one to the working dir and if the changes do
+        not raise conflicts call the `replay` function to mirror the
+        changes on the target.
 
         Return a sequence (potentially empty!) of conflicts.
@@ -58 +60 @@
             if res:
                 conflicts.append((c, res))
-
+            else:
+                if replay:
+                    replay(root, c)
+                    
         return conflicts
         

vcpx/target.py

@@ -90 +90 @@
         
         raise "%s should override this method" % self.__class__
-