Changeset 922 in tailor


Ignore:
Timestamp:
10/17/05 03:45:06 (8 years ago)
Author:
lele@…
Hash name:
20051017014506-97f81-5cf1fd78b1fd3a8fac13f087919f12e8fa9c8840
Message:

Complete the application of a changeset, performing a merge

File:
1 edited

Legend:

Unmodified
Added
Removed

  • vcpx/bzr.py

    r921 r922  
    7373        Apply given remote revision to workingdir 
    7474        """ 
     75        from bzrlib.merge import merge 
     76 
     77        oldrevno = self._b.revno() 
    7578        self._b.append_revision(changeset.revision) 
     79        merge((self.basedir, -1), (self.basedir, oldrevno), 
     80              check_clean=False, this_dir=self.basedir) 
    7681        return [] # No conflicts for now 
    7782 
Note: See TracChangeset for help on using the changeset viewer.