comparison hgext/convert/hg.py @ 5353:9c0f864fddca

Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 30 Sep 2007 12:36:11 +0200
parents cc34be74eeec 002fe2f364f5
children b98c377b3c16
comparison
equal deleted inserted replaced
5352:cc34be74eeec 5353:9c0f864fddca
59 59
60 def delfile(self, f): 60 def delfile(self, f):
61 try: 61 try:
62 util.unlink(self.repo.wjoin(f)) 62 util.unlink(self.repo.wjoin(f))
63 #self.repo.remove([f]) 63 #self.repo.remove([f])
64 except: 64 except OSError:
65 pass 65 pass
66 66
67 def setbranch(self, branch, pbranch, parents): 67 def setbranch(self, branch, pbranch, parents):
68 if (not self.clonebranches) or (branch == self.lastbranch): 68 if (not self.clonebranches) or (branch == self.lastbranch):
69 return 69 return