##// END OF EJS Templates
merge: directly use repo.vfs.join...
Pierre-Yves David -
r31323:102d3a30 default
parent child Browse files
Show More
@@ -124,7 +124,7 b' class mergestate(object):'
124 self._mdstate = 's'
124 self._mdstate = 's'
125 else:
125 else:
126 self._mdstate = 'u'
126 self._mdstate = 'u'
127 shutil.rmtree(self._repo.join('merge'), True)
127 shutil.rmtree(self._repo.vfs.join('merge'), True)
128 self._results = {}
128 self._results = {}
129 self._dirty = False
129 self._dirty = False
130
130
@@ -1678,7 +1678,7 b' def update(repo, node, branchmerge, forc'
1678 repo.setparents(fp1, fp2)
1678 repo.setparents(fp1, fp2)
1679 recordupdates(repo, actions, branchmerge)
1679 recordupdates(repo, actions, branchmerge)
1680 # update completed, clear state
1680 # update completed, clear state
1681 util.unlink(repo.join('updatestate'))
1681 util.unlink(repo.vfs.join('updatestate'))
1682
1682
1683 if not branchmerge:
1683 if not branchmerge:
1684 repo.dirstate.setbranch(p2.branch())
1684 repo.dirstate.setbranch(p2.branch())
General Comments 0
You need to be logged in to leave comments. Login now