Logo Search packages:      
Sourcecode: rabbitvcs version File versions  Download package

def rabbitvcs::lib::vcs::svn::SVN::merge_trees (   self,
  url_or_path1,
  revision1,
  url_or_path2,
  revision2,
  local_path,
  force = False,
  recurse = True,
  record_only = False 
)

Merge two trees into one.

@type   url_or_path1: string
@param  url_or_path1: From WC/URL location

@type   revision1: pysvn.Revision
@param  revision1: Indicates the revision of the URL/Path

@type   url_or_path2: string
@param  url_or_path2: To WC/URL location

@type   revision2: pysvn.Revision
@param  revision2: Indicates the revision of the URL/Path

@type   local_path: string
@param  local_path: Target working copy path

@type   force: boolean
@param  force: unsure

@type   recurse: boolean
@param  recurse: Merge children recursively

@type   record_only: boolean
@param  record_only: unsure

TODO: Will firm up the parameter documentation later

Definition at line 1598 of file __init__.py.

                                                                     :
        """
        Merge two trees into one.

        @type   url_or_path1: string
        @param  url_or_path1: From WC/URL location

        @type   revision1: pysvn.Revision
        @param  revision1: Indicates the revision of the URL/Path

        @type   url_or_path2: string
        @param  url_or_path2: To WC/URL location

        @type   revision2: pysvn.Revision
        @param  revision2: Indicates the revision of the URL/Path
        
        @type   local_path: string
        @param  local_path: Target working copy path
        
        @type   force: boolean
        @param  force: unsure
        
        @type   recurse: boolean
        @param  recurse: Merge children recursively
        
        @type   record_only: boolean
        @param  record_only: unsure
        
        TODO: Will firm up the parameter documentation later
        
        """

        return self.client.merge(url_or_path1, revision1.primitive(), 
            url_or_path2, revision2.primitive(), local_path, force, recurse, 
            record_only)

    def diff(self, tmp_path, url_or_path, revision1, url_or_path2, revision2, 


Generated by  Doxygen 1.6.0   Back to index