Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/dirstate.py @ 4334:1cc5fc1d0994
Merge with crew-stable.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Mon, 09 Apr 2007 04:57:25 -0300 |
parents | fe0fe0b4d73b 1b9fc3f48861 |
children | abeb3edb2b4e |
line wrap: on
line diff
--- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -314,7 +314,7 @@ class dirstate(object): def write(self): if not self.dirty: return - st = self.opener("dirstate", "w", atomic=True) + st = self.opener("dirstate", "w", atomictemp=True) st.write("".join(self.pl)) for f, e in self.map.items(): c = self.copied(f) @@ -322,6 +322,7 @@ class dirstate(object): f = f + "\0" + c e = struct.pack(self.format, e[0], e[1], e[2], e[3], len(f)) st.write(e + f) + st.rename() self.dirty = 0 def filterfiles(self, files):