francois / piston fork watch download tarball
public
Description: Piston is a utility that eases vendor branch management. This repository is a complete reimplementation of Piston to provide different backends, depending on the repositories and working copies you pistonize from.
Homepage: http://piston.rubyforge.org/
Clone URL: git://github.com/francois/piston.git 
Piston::Svn::WorkingCopy knows how to merge changes that occured locally 
with the new changes.
francois (author)
Tue Jul 22 17:09:51 -0700 2008
commit  0adf69e8ecd450eb6b68ddcfbf07d0f2bd6e7560
tree    4b9349f7abb582bfc4cdb93404fe473180f2ab52
parent  10a3e29fde830e8e564d44ea38ec2bd0705e934d
0
lib/piston/svn/working_copy.rb 
...
80
81
82
 
 
 
 
 
 
 
 
83
84
85
 
...
80
81
82
83
84
85
86
87
88
89
90
91
92
93
 
0
@@ -80,6 +80,14 @@ module Piston
0
 
0
       def update(from, to, todir)
0
         copy_from(to)
0
+        merge_changes(from, to, todir)
0
+      end
0
+
0
+      def merge_changes(from, to, todir)
0
+        data = svn(:info, path + "/.piston.yml")
0
+        info = YAML.load(data)
0
+        initial_revision = info["Last Changed Rev"].to_i.succ
0
+        svn(:merge, "--revision", "#{initial_revision}:#{to.revision}", from.url, path)
0
       end
0
 
0
       def remove_external_references(*targets)

Comments

    No one has commented yet.